[KJ][PATCH] ROUND_UP macro cleanup in arch/parisc

[KJ][PATCH] ROUND_UP macro cleanup in arch/parisc

[Milind Arun Choudhary]

ROUND_UP macro cleanup, use ALIGN where ever appropriate

Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>

---
 hpux/fs.c             |    5 ++---
 kernel/sys_parisc32.c |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)



diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index 4204cd1..7ff5546 100644
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -21,6 +21,7 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/file.h>
@@ -70,7 +71,6 @@ struct getdents_callback {
 };
 
 #define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
-#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
 
 static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
 		u64 ino, unsigned d_type)
@@ -78,7 +78,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
 	struct hpux_dirent * dirent;
 	struct getdents_callback * buf = (struct getdents_callback *) __buf;
 	ino_t d_ino;
-	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
+	int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1,sizeof(long));
 
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
@@ -103,7 +103,6 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
 }
 
 #undef NAME_OFFSET
-#undef ROUND_UP
 
 int hpux_getdents(unsigned int fd, struct hpux_dirent *dirent, unsigned int count)
 {
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index ce3245f..e590880 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -311,14 +311,13 @@ struct readdir32_callback {
 	int count;
 };
 
-#define ROUND_UP(x,a)	((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1)))
 #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
 static int filldir32 (void *__buf, const char *name, int namlen,
 			loff_t offset, u64 ino, unsigned int d_type)
 {
 	struct linux32_dirent __user * dirent;
 	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
-	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1, 4);
+	int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, 4);
 	u32 d_ino;
 
 	buf->error = -EINVAL;	/* only used if we fail.. */

-- 
Milind Arun Choudhary

Re: [KJ][PATCH] ROUND_UP macro cleanup in arch/parisc

[Grant Grundler]

On Sun, Apr 01, 2007 at 01:06:46PM +0530, Milind Arun Choudhary wrote:
> ROUND_UP macro cleanup, use ALIGN where ever appropriate
> 
> Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>

Also looks good to me. Just one white space nit we can fixup by hand.

Signed-off-by: Grant Grundler <grundler@parisc-linux.org>


> 
> ---
>  hpux/fs.c             |    5 ++---
>  kernel/sys_parisc32.c |    3 +--
>  2 files changed, 3 insertions(+), 5 deletions(-)
> 
> 
> 
> diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
> index 4204cd1..7ff5546 100644
> --- a/arch/parisc/hpux/fs.c
> +++ b/arch/parisc/hpux/fs.c
> @@ -21,6 +21,7 @@
>   *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>   */
>  
> +#include <linux/kernel.h>
>  #include <linux/mm.h>
>  #include <linux/sched.h>
>  #include <linux/file.h>
> @@ -70,7 +71,6 @@ struct getdents_callback {
>  };
>  
>  #define NAME_OFFSET(de) ((int) ((de)->d_name - (char *) (de)))
> -#define ROUND_UP(x) (((x)+sizeof(long)-1) & ~(sizeof(long)-1))
>  
>  static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
>  		u64 ino, unsigned d_type)
> @@ -78,7 +78,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
>  	struct hpux_dirent * dirent;
>  	struct getdents_callback * buf = (struct getdents_callback *) __buf;
>  	ino_t d_ino;
> -	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);
> +	int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1,sizeof(long));

Nit: I'd want a blank space after the comma.

thanks,
grant

>  
>  	buf->error = -EINVAL;	/* only used if we fail.. */
>  	if (reclen > buf->count)
> @@ -103,7 +103,6 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
>  }
>  
>  #undef NAME_OFFSET
> -#undef ROUND_UP
>  
>  int hpux_getdents(unsigned int fd, struct hpux_dirent *dirent, unsigned int count)
>  {
> diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
> index ce3245f..e590880 100644
> --- a/arch/parisc/kernel/sys_parisc32.c
> +++ b/arch/parisc/kernel/sys_parisc32.c
> @@ -311,14 +311,13 @@ struct readdir32_callback {
>  	int count;
>  };
>  
> -#define ROUND_UP(x,a)	((__typeof__(x))(((unsigned long)(x) + ((a) - 1)) & ~((a) - 1)))
>  #define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
>  static int filldir32 (void *__buf, const char *name, int namlen,
>  			loff_t offset, u64 ino, unsigned int d_type)
>  {
>  	struct linux32_dirent __user * dirent;
>  	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
> -	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1, 4);
> +	int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, 4);
>  	u32 d_ino;
>  
>  	buf->error = -EINVAL;	/* only used if we fail.. */
> 
> -- 
> Milind Arun Choudhary