diff options
| author | David Sterba <dsterba@suse.com> | 2016-03-30 16:01:12 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-04-04 16:29:22 +0200 |
| commit | 8f282f71eaee7ac979cdbe525f76daa0722798a8 (patch) | |
| tree | 30dc1fb3e5b7d3951a0b24f2328c0290584f6b10 /fs/btrfs/ctree.c | |
| parent | 918c2ee103cf9956f1c61d3f848dbb49fd2d104a (diff) | |
| download | linux-8f282f71eaee7ac979cdbe525f76daa0722798a8.tar.gz linux-8f282f71eaee7ac979cdbe525f76daa0722798a8.tar.bz2 linux-8f282f71eaee7ac979cdbe525f76daa0722798a8.zip | |
btrfs: fallback to vmalloc in btrfs_compare_tree
The allocation of node could fail if the memory is too fragmented for a
given node size, practically observed with 64k.
http://article.gmane.org/gmane.comp.file-systems.btrfs/54689
Reported-and-tested-by: Jean-Denis Girard <jd.girard@sysnux.pf>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 77592931ab4f..ec7928a27aaa 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -19,6 +19,7 @@ #include <linux/sched.h> #include <linux/slab.h> #include <linux/rbtree.h> +#include <linux/vmalloc.h> #include "ctree.h" #include "disk-io.h" #include "transaction.h" @@ -5361,10 +5362,13 @@ int btrfs_compare_trees(struct btrfs_root *left_root, goto out; } - tmp_buf = kmalloc(left_root->nodesize, GFP_KERNEL); + tmp_buf = kmalloc(left_root->nodesize, GFP_KERNEL | __GFP_NOWARN); if (!tmp_buf) { - ret = -ENOMEM; - goto out; + tmp_buf = vmalloc(left_root->nodesize); + if (!tmp_buf) { + ret = -ENOMEM; + goto out; + } } left_path->search_commit_root = 1; @@ -5565,7 +5569,7 @@ int btrfs_compare_trees(struct btrfs_root *left_root, out: btrfs_free_path(left_path); btrfs_free_path(right_path); - kfree(tmp_buf); + kvfree(tmp_buf); return ret; } |