btrfs: protect space cache inode alloc with GFP_NOFS

[sfrench/cifs-2.6.git] / fs / btrfs / free-space-cache.c

diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index ed097ff023e839e907e620a8be899fcb91d91072..a1f379e8ad1363fcb8dfb1accbea9cdc12c13f66 100644 (file)
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -10,6 +10,7 @@
 #include <linux/math64.h>
 #include <linux/ratelimit.h>
 #include <linux/error-injection.h>
+#include <linux/sched/mm.h>
 #include "ctree.h"
 #include "free-space-cache.h"
 #include "transaction.h"
@@ -47,6 +48,7 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
        struct btrfs_free_space_header *header;
        struct extent_buffer *leaf;
        struct inode *inode = NULL;
+       unsigned nofs_flag;
        int ret;
 
        key.objectid = BTRFS_FREE_SPACE_OBJECTID;
@@ -68,7 +70,13 @@ static struct inode *__lookup_free_space_inode(struct btrfs_root *root,
        btrfs_disk_key_to_cpu(&location, &disk_key);
        btrfs_release_path(path);
 
+       /*
+        * We are often under a trans handle at this point, so we need to make
+        * sure NOFS is set to keep us from deadlocking.
+        */
+       nofs_flag = memalloc_nofs_save();
        inode = btrfs_iget(fs_info->sb, &location, root, NULL);
+       memalloc_nofs_restore(nofs_flag);
        if (IS_ERR(inode))
                return inode;