Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dab8157 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: Hold csum mutex while reading in sums during readpages 



Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 2dd3e67b

fs/btrfs/file-item.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

fs/btrfs/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}