From: Milind Arun Choudhary ROUND_UP macro cleanup use ALIGN Signed-off-by: Milind Arun Choudhary Signed-off-by: Andrew Morton --- fs/smbfs/request.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff -puN fs/smbfs/request.c~round_up-macro-cleanup-in-fs-smbfs-requestc fs/smbfs/request.c --- a/fs/smbfs/request.c~round_up-macro-cleanup-in-fs-smbfs-requestc +++ a/fs/smbfs/request.c @@ -6,6 +6,7 @@ * Please add a note about your changes to smbfs in the ChangeLog file. */ +#include #include #include #include @@ -22,8 +23,6 @@ /* #define SMB_SLAB_DEBUG (SLAB_RED_ZONE | SLAB_POISON) */ #define SMB_SLAB_DEBUG 0 -#define ROUND_UP(x) (((x)+3) & ~3) - /* cache for request structures */ static struct kmem_cache *req_cachep; @@ -200,8 +199,8 @@ static int smb_setup_trans2request(struc const int smb_parameters = 15; const int header = SMB_HEADER_LEN + 2 * smb_parameters + 2; - const int oparam = ROUND_UP(header + 3); - const int odata = ROUND_UP(oparam + req->rq_lparm); + const int oparam = ALIGN(header + 3, sizeof(u32)); + const int odata = ALIGN(oparam + req->rq_lparm, sizeof(u32)); const int bcc = (req->rq_data ? odata + req->rq_ldata : oparam + req->rq_lparm) - header; _