Skip to contentSkip to conversation

ROUND_UP cleanup in arch/mips/kernel/sysirix.c

PATCH New Milind Arun Choudhary 1 participant 1 message Apr 1, 2007

Subsystems (2)
Kernel janitors MIPS
lore
Share & tools
lore

Milind Arun Choudhary

author
#0 lore raw

PATCH 1/1 ROUND_UP cleanup in arch/mips/kernel/sysirix.c

ROUND_UP(32|64) cleanup, use ALIGN

Signed-off-by Milind Arun Choudhary <[email protected]>
---
 sysirix.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
arch/mips/kernel/sysirix.c +2 -4
index 93a1484..59c25bc 100644
@@ -1736,14 +1736,13 @@ struct irix_dirent32_callback {
 };
 
 #define NAME_OFFSET32(de) ((int) ((de)->d_name - (char *) (de)))
-#define ROUND_UP32(x) (((x)+sizeof(u32)-1) & ~(sizeof(u32)-1))
 
 static int irix_filldir32(void *__buf, const char *name,
 	int namlen, loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct irix_dirent32 __user *dirent;
 	struct irix_dirent32_callback *buf = __buf;
-	unsigned short reclen = ROUND_UP32(NAME_OFFSET32(dirent) + namlen + 1);
+	unsigned short reclen = ALIGN(NAME_OFFSET32(dirent) + namlen + 1, sizeof(u32));
 	int err = 0;
 	u32 d_ino;
 

@@ -1838,14 +1837,13 @@ struct irix_dirent64_callback {
 };
 
 #define NAME_OFFSET64(de) ((int) ((de)->d_name - (char *) (de)))
-#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))
 
 static int irix_filldir64(void *__buf, const char *name,
 	int namlen, loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct irix_dirent64 __user *dirent;
 	struct irix_dirent64_callback * buf = __buf;
-	unsigned short reclen = ROUND_UP64(NAME_OFFSET64(dirent) + namlen + 1);
+	unsigned short reclen = ALIGN(NAME_OFFSET64(dirent) + namlen + 1,sizeof(u64));
 	int err = 0;
 
 	if (!access_ok(VERIFY_WRITE, buf, sizeof(*buf)))
Signature · 1 line
Milind Arun Choudhary