浏览代码

Btrfs: fix deadlock caused by the race between relocation

We can not do flushable reservation for the relocation when we create snapshot,
because it may make the transaction commit task and the flush task wait for
each other and the deadlock happens.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Miao Xie 13 年之前
父节点
当前提交
62f30c5462
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      fs/btrfs/transaction.c

+ 2 - 2
fs/btrfs/transaction.c

@@ -882,8 +882,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,
 	btrfs_reloc_pre_snapshot(trans, pending, &to_reserve);
 	btrfs_reloc_pre_snapshot(trans, pending, &to_reserve);
 
 
 	if (to_reserve > 0) {
 	if (to_reserve > 0) {
-		ret = btrfs_block_rsv_add(root, &pending->block_rsv,
-					  to_reserve);
+		ret = btrfs_block_rsv_add_noflush(root, &pending->block_rsv,
+						  to_reserve);
 		if (ret) {
 		if (ret) {
 			pending->error = ret;
 			pending->error = ret;
 			goto fail;
 			goto fail;