From 20bc7252ca14b4311ed255f5859184e86a5d1e28 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Sat, 31 Jan 2004 12:21:20 +1100 Subject: [PATCH] [XFS] Revert botched merge where KM_NOFS check was unintentionally dropped. SGI Modid: xfs-linux:xfs-kern:165631a --- fs/xfs/linux/kmem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/linux/kmem.h b/fs/xfs/linux/kmem.h index a8fb09f2f604b..a75bdd210884c 100644 --- 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; -- 2.53.0