---

yaml --- r: 128877 b: refs/heads/master c: 6dab815 h: refs/heads/master i: 128875: 1bba3f4 v: v3
git-mirror · Sep 25, 2008 · 8a9dbe9 · 8a9dbe9
1 parent ad0c028
commit 8a9dbe9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dd3e67b1eaec8504da7e12b8afee77323a49f38
+refs/heads/master: 6dab81574346c831ded96ae3ab0e8f9ca72c37ae
diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c
@@ -150,7 +150,6 @@ int btrfs_lookup_bio_sums(struct btrfs_root *root, struct inode *inode,
 	struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
 
 	path = btrfs_alloc_path();
-	path->reada = 2;
 
 	WARN_ON(bio->bi_vcnt <= 0);
 
@@ -177,6 +176,7 @@ int btrfs_lookup_bio_sums(struct btrfs_root *root, struct inode *inode,
 				printk("no csum found for inode %lu start "
 				       "%llu\n", inode->i_ino,
 				       (unsigned long long)offset);
+				item = NULL;
 				goto found;
 			}
 			btrfs_item_key_to_cpu(path->nodes[0], &found_key,

diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
@@ -376,7 +376,9 @@ int btrfs_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,
 	if (!(rw & (1 << BIO_RW))) {
 		if (!btrfs_test_opt(root, NODATASUM) &&
 		    !btrfs_test_flag(inode, NODATASUM)) {
+			mutex_lock(&BTRFS_I(inode)->csum_mutex);
 			btrfs_lookup_bio_sums(root, inode, bio);
+			mutex_unlock(&BTRFS_I(inode)->csum_mutex);
 		}
 		goto mapit;
 	}