diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 14:03:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 14:03:39 -0800 |
| commit | 4660ba63f1c4e07c20a435e084f12ba48a82bd2b (patch) | |
| tree | 494973a1dd4102eede20298f478574801af31b86 /fs/btrfs/extent-tree.c | |
| parent | 958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61 (diff) | |
| parent | ec29ed5b407d618a8128f5942aade9e1758aa14b (diff) | |
| download | kernel_samsung_smdk4412-4660ba63f1c4e07c20a435e084f12ba48a82bd2b.zip kernel_samsung_smdk4412-4660ba63f1c4e07c20a435e084f12ba48a82bd2b.tar.gz kernel_samsung_smdk4412-4660ba63f1c4e07c20a435e084f12ba48a82bd2b.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: fix fiemap bugs with delalloc
Btrfs: set FMODE_EXCL in btrfs_device->mode
Btrfs: make btrfs_rm_device() fail gracefully
Btrfs: Avoid accessing unmapped kernel address
Btrfs: Fix BTRFS_IOC_SUBVOL_SETFLAGS ioctl
Btrfs: allow balance to explicitly allocate chunks as it relocates
Btrfs: put ENOSPC debugging under a mount option
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index f3c96fc..588ff98 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -5376,7 +5376,7 @@ again: num_bytes, data, 1); goto again; } - if (ret == -ENOSPC) { + if (ret == -ENOSPC && btrfs_test_opt(root, ENOSPC_DEBUG)) { struct btrfs_space_info *sinfo; sinfo = __find_space_info(root->fs_info, data); @@ -8065,6 +8065,13 @@ out: return ret; } +int btrfs_force_chunk_alloc(struct btrfs_trans_handle *trans, + struct btrfs_root *root, u64 type) +{ + u64 alloc_flags = get_alloc_profile(root, type); + return do_chunk_alloc(trans, root, 2 * 1024 * 1024, alloc_flags, 1); +} + /* * helper to account the unused space of all the readonly block group in the * list. takes mirrors into account. |