소스 검색

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fix from Chris Mason:
 "Sage hit a deadlock with ceph on btrfs, and Josef tracked it down to a
  regression in our initial rc1 pull.  When doing nocow writes we were
  sometimes starting a transaction with locks held"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: release path before starting transaction in can_nocow_extent
Linus Torvalds 12 년 전
부모
커밋
bdeeab62a6
1개의 변경된 파일1개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      fs/btrfs/inode.c

+ 1 - 0
fs/btrfs/inode.c

@@ -6437,6 +6437,7 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,
 
 
 	if (btrfs_extent_readonly(root, disk_bytenr))
 	if (btrfs_extent_readonly(root, disk_bytenr))
 		goto out;
 		goto out;
+	btrfs_release_path(path);
 
 
 	/*
 	/*
 	 * look for other files referencing this extent, if we
 	 * look for other files referencing this extent, if we