ROUND_UP macro cleanup in arch/alpha/kernel/osf_sys.c
ROUND_UP macro cleanup use ALIGN Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
97a572b3b8
commit
180e53a71f
|
@ -93,7 +93,6 @@ osf_set_program_attributes(unsigned long text_start, unsigned long text_len,
|
||||||
* offset differences aren't the same as "d_reclen").
|
* offset differences aren't the same as "d_reclen").
|
||||||
*/
|
*/
|
||||||
#define NAME_OFFSET offsetof (struct osf_dirent, d_name)
|
#define NAME_OFFSET offsetof (struct osf_dirent, d_name)
|
||||||
#define ROUND_UP(x) (((x)+3) & ~3)
|
|
||||||
|
|
||||||
struct osf_dirent {
|
struct osf_dirent {
|
||||||
unsigned int d_ino;
|
unsigned int d_ino;
|
||||||
|
@ -115,7 +114,7 @@ osf_filldir(void *__buf, const char *name, int namlen, loff_t offset,
|
||||||
{
|
{
|
||||||
struct osf_dirent __user *dirent;
|
struct osf_dirent __user *dirent;
|
||||||
struct osf_dirent_callback *buf = (struct osf_dirent_callback *) __buf;
|
struct osf_dirent_callback *buf = (struct osf_dirent_callback *) __buf;
|
||||||
unsigned int reclen = ROUND_UP(NAME_OFFSET + namlen + 1);
|
unsigned int reclen = ALIGN(NAME_OFFSET + namlen + 1, sizeof(u32));
|
||||||
unsigned int d_ino;
|
unsigned int d_ino;
|
||||||
|
|
||||||
buf->error = -EINVAL; /* only used if we fail */
|
buf->error = -EINVAL; /* only used if we fail */
|
||||||
|
@ -174,7 +173,6 @@ osf_getdirentries(unsigned int fd, struct osf_dirent __user *dirent,
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef ROUND_UP
|
|
||||||
#undef NAME_OFFSET
|
#undef NAME_OFFSET
|
||||||
|
|
||||||
asmlinkage unsigned long
|
asmlinkage unsigned long
|
||||||
|
|
Loading…
Reference in a new issue