Merge branch 'akpm-current/current'

[karo-tx-linux.git] / fs / xfs / xfs_qm.c

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index 7af7648c06c63bd63ec21b150cc2713914f28c08..532ab79d38fe376c14a5463a97195b59a61d8f84 100644 (file)
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -525,7 +525,7 @@ xfs_qm_shrink_scan(
        unsigned long           freed;
        int                     error;
 
-       if ((sc->gfp_mask & (__GFP_FS|__GFP_WAIT)) != (__GFP_FS|__GFP_WAIT))
+       if ((sc->gfp_mask & (__GFP_FS|__GFP_DIRECT_RECLAIM)) != (__GFP_FS|__GFP_DIRECT_RECLAIM))
                return 0;
 
        INIT_LIST_HEAD(&isol.buffers);