[XFS] Revert botched merge where KM_NOFS check was unintentionally dropped.

SGI Modid: xfs-linux:xfs-kern:165631a

diff --git a/fs/xfs/linux/kmem.h b/fs/xfs/linux/kmem.h
index a8fb09f2f604b389c724acfb4cf67fbbb84579fa..a75bdd210884cc27f5116e3928aae4e46b5a3ff6 100644 (file)
--- a/fs/xfs/linux/kmem.h
+++ b/fs/xfs/linux/kmem.h
@@ -90,7 +90,7 @@ kmem_flags_convert(int flags)
        lflags = (flags & KM_NOSLEEP) ? GFP_ATOMIC : (GFP_KERNEL|__GFP_NOFAIL);
 
        /* avoid recusive callbacks to filesystem during transactions */
-       if (PFLAGS_TEST_FSTRANS())
+       if (PFLAGS_TEST_FSTRANS() || (flags & KM_NOFS))
                lflags &= ~__GFP_FS;
 
        return lflags;