Browse Source

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>
Miao Xie 12 years ago
parent
commit
5881cfc924
1 changed files with 4 additions and 2 deletions
  1. 4 2
      fs/btrfs/extent-tree.c

+ 4 - 2
fs/btrfs/extent-tree.c

@@ -6681,9 +6681,11 @@ try_reserve:
 		return block_rsv;
 		return block_rsv;
 	/*
 	/*
 	 * If we couldn't reserve metadata bytes try and use some from
 	 * 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);
 		ret = block_rsv_use_bytes(global_rsv, blocksize);
 		if (!ret)
 		if (!ret)
 			return global_rsv;
 			return global_rsv;