From 856350fb54126eb81aafc4d8adb4ab1c3d8b7662 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Mon, 15 Sep 2008 13:22:54 +0300 Subject: [PATCH] --- yaml --- r: 111143 b: refs/heads/master c: 232087cb734c7035c0a8947fb05d3e8092ff6c4d h: refs/heads/master i: 111141: 02cad5e05596ddd78fbfb77bd1b1a2f3c91c9394 111139: 4a79a7ed0f9a5e6eadcd7b35c4c40bff475a07b4 111135: e317c02235db79ed94106e9f2c0855cb9e8cecbc v: v3 --- [refs] | 2 +- trunk/fs/cifs/misc.c | 6 ++---- trunk/fs/cifs/transport.c | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 70ce9c584d53..6be3e91c11b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 388e57b2759672a3e3ede0d2f7e95124b417b0a3 +refs/heads/master: 232087cb734c7035c0a8947fb05d3e8092ff6c4d diff --git a/trunk/fs/cifs/misc.c b/trunk/fs/cifs/misc.c index 4b17f8fe3157..654d972a88f4 100644 --- a/trunk/fs/cifs/misc.c +++ b/trunk/fs/cifs/misc.c @@ -150,8 +150,7 @@ cifs_buf_get(void) but it may be more efficient to always alloc same size albeit slightly larger than necessary and maxbuffersize defaults to this and can not be bigger */ - ret_buf = (struct smb_hdr *) mempool_alloc(cifs_req_poolp, - GFP_KERNEL | GFP_NOFS); + ret_buf = mempool_alloc(cifs_req_poolp, GFP_NOFS); /* clear the first few header bytes */ /* for most paths, more is cleared in header_assemble */ @@ -188,8 +187,7 @@ cifs_small_buf_get(void) but it may be more efficient to always alloc same size albeit slightly larger than necessary and maxbuffersize defaults to this and can not be bigger */ - ret_buf = (struct smb_hdr *) mempool_alloc(cifs_sm_req_poolp, - GFP_KERNEL | GFP_NOFS); + ret_buf = mempool_alloc(cifs_sm_req_poolp, GFP_NOFS); if (ret_buf) { /* No need to clear memory here, cleared in header assemble */ /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/ diff --git a/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c index e286db9f5ee2..bf0e6d8e382a 100644 --- a/trunk/fs/cifs/transport.c +++ b/trunk/fs/cifs/transport.c @@ -50,8 +50,7 @@ AllocMidQEntry(const struct smb_hdr *smb_buffer, struct cifsSesInfo *ses) return NULL; } - temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp, - GFP_KERNEL | GFP_NOFS); + temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS); if (temp == NULL) return temp; else {