From 2434e6a06187d75f45540f683125ab76a0317a00 Mon Sep 17 00:00:00 2001 From: Milind Arun Choudhary Date: Sun, 6 May 2007 14:50:36 -0700 Subject: [PATCH] --- yaml --- r: 54255 b: refs/heads/master c: 180e53a71f78e72a244deb65140928d4f3d72385 h: refs/heads/master i: 54253: 0bbb1de176909c1bbfaa66599216d05ba251aea4 54251: ed0adcf1e34974514d8d1b29a73f65bcbdc8ce6c 54247: d0accf281715c3d61b91f0cfd2e15bdeb18435a6 54239: e3528d2e42e72ce955a2c4c543c29814e803e012 v: v3 --- [refs] | 2 +- trunk/arch/alpha/kernel/osf_sys.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fd81414ffd08..b59dd0fe7bde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97a572b3b877173e284c687be34d8ae81b826160 +refs/heads/master: 180e53a71f78e72a244deb65140928d4f3d72385 diff --git a/trunk/arch/alpha/kernel/osf_sys.c b/trunk/arch/alpha/kernel/osf_sys.c index 67ae41dcb6fa..ea405f5713ce 100644 --- a/trunk/arch/alpha/kernel/osf_sys.c +++ b/trunk/arch/alpha/kernel/osf_sys.c @@ -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"). */ #define NAME_OFFSET offsetof (struct osf_dirent, d_name) -#define ROUND_UP(x) (((x)+3) & ~3) struct osf_dirent { 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_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; buf->error = -EINVAL; /* only used if we fail */ @@ -174,7 +173,6 @@ osf_getdirentries(unsigned int fd, struct osf_dirent __user *dirent, return error; } -#undef ROUND_UP #undef NAME_OFFSET asmlinkage unsigned long