diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2013-05-13 13:55:11 +0000 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-05-17 21:40:25 -0400 |
| commit | 5881cfc924c8143dbc3e1f343516fc6527eb8311 (patch) | |
| tree | 9c892f0bbe0d393d2e6393a131d88498307a3691 | |
| parent | b586b32374909863311b7c916c7c0c709141e35a (diff) | |
| download | linux-stable-5881cfc924c8143dbc3e1f343516fc6527eb8311.tar.gz linux-stable-5881cfc924c8143dbc3e1f343516fc6527eb8311.tar.bz2 linux-stable-5881cfc924c8143dbc3e1f343516fc6527eb8311.zip | |
Btrfs: don't steal the reserved space from the global reserve if their space type is different
If the type of the space we need is different with the global reserve, we
can not steal the space from the global reserve, because we can not allocate
the space from the free space cache that the global reserve points to.
Cc: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
| -rw-r--r-- | fs/btrfs/extent-tree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 5e2c0bf84075..54e63b273a64 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -6681,9 +6681,11 @@ try_reserve: return block_rsv; /* * If we couldn't reserve metadata bytes try and use some from - * the global reserve. + * the global reserve if its space type is the same as the global + * reservation. */ - if (block_rsv->type != BTRFS_BLOCK_RSV_GLOBAL) { + if (block_rsv->type != BTRFS_BLOCK_RSV_GLOBAL && + block_rsv->space_info == global_rsv->space_info) { ret = block_rsv_use_bytes(global_rsv, blocksize); if (!ret) return global_rsv; |