The patch titled cifs: don't use GFP_KERNEL with GFP_NOFS has been removed from the -mm tree. Its filename was cifs-dont-use-gfp_kernel-with-gfp_nofs.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cifs: don't use GFP_KERNEL with GFP_NOFS From: Pekka Enberg <penberg@xxxxxxxxxxxxxx> GFP_KERNEL and GFP_NOFS are mutually exclusive. If you combine them, you end up with plain GFP_KERNEL which can deadlock in cases where you really want GFP_NOFS. Cc: Steve French <sfrench@xxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/cifs/misc.c | 6 ++---- fs/cifs/transport.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff -puN fs/cifs/misc.c~cifs-dont-use-gfp_kernel-with-gfp_nofs fs/cifs/misc.c --- a/fs/cifs/misc.c~cifs-dont-use-gfp_kernel-with-gfp_nofs +++ a/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 -puN fs/cifs/transport.c~cifs-dont-use-gfp_kernel-with-gfp_nofs fs/cifs/transport.c --- a/fs/cifs/transport.c~cifs-dont-use-gfp_kernel-with-gfp_nofs +++ a/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 { _ Patches currently in -mm which might be from penberg@xxxxxxxxxxxxxx are repeatable-slab-corruption-with-ltp-msgctl08.patch git-ftrace.patch git-cifs.patch git-slab.patch hfsplus-fix-buffer-overflow-with-a-corrupted-image.patch cgroups-fix-declaration-of-cgroup_mm_owner_callbacks.patch slab-leaks3-default-y.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html