Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

[linux-2.6-omap-h63xx.git] / fs / cifs / transport.c

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index e286db9f5ee2c66d34b0c3c4deedf851b18b7687..bf0e6d8e382a6a4286a61dc748bd73ef4810e48b 100644 (file)
--- a/fs/cifs/transport.c
+++ b/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 {