Some memory allocations in cifs use GFP_KERNEL | GFP_NOFS as gfs flags
but GFP_KERNEL | GFP_NOFS equals to GFP_KERNEL. So these GFP_NOFS have
no effect.
This patch fixes these flags and also removes unnecessary casts to
mempool_alloc.
Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx>
Cc: Steve French <sfrench@xxxxxxxxx>
Cc: linux-cifs-client@xxxxxxxxxxxxxxx
---
fs/cifs/misc.c | 6 ++----
fs/cifs/transport.c | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
Index: 2.6-git/fs/cifs/misc.c
===================================================================
--- 2.6-git.orig/fs/cifs/misc.c
+++ 2.6-git/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);*/
Index: 2.6-git/fs/cifs/transport.c
===================================================================
--- 2.6-git.orig/fs/cifs/transport.c
+++ 2.6-git/fs/cifs/transport.c
@@ -50,8 +50,7 @@ AllocMidQEntry(const struct smb_hdr *smb
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 {
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
