diff options
| author | Milind Arun Choudhary <milindchoudhary@gmail.com> | 2007-05-08 00:29:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:09 -0700 |
| commit | 1525dccbc248b87568f2477f1b2d417b69d418c3 (patch) | |
| tree | 172b8bb89faf202477db7a587aadb6369ad95cf6 /fs/smbfs | |
| parent | 022a1692444cd683ef42f637cc717db4d8fd9378 (diff) | |
| download | blackbird-op-linux-1525dccbc248b87568f2477f1b2d417b69d418c3.tar.gz blackbird-op-linux-1525dccbc248b87568f2477f1b2d417b69d418c3.zip | |
ROUND_UP macro cleanup in fs/smbfs/request.c
ROUND_UP macro cleanup use ALIGN
Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/request.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/smbfs/request.c b/fs/smbfs/request.c index 723f7c667661..c288fbe7953d 100644 --- a/fs/smbfs/request.c +++ b/fs/smbfs/request.c @@ -6,6 +6,7 @@ * Please add a note about your changes to smbfs in the ChangeLog file. */ +#include <linux/kernel.h> #include <linux/types.h> #include <linux/fs.h> #include <linux/slab.h> @@ -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(struct smb_request *req) 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; |
