diff options
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 09c58a35b429..24e8a356a36c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -2819,7 +2819,7 @@ static int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end, | |||
2819 | if (ret) | 2819 | if (ret) |
2820 | goto zeroit; | 2820 | goto zeroit; |
2821 | 2821 | ||
2822 | csum = btrfs_csum_data(root, kaddr + offset, csum, end - start + 1); | 2822 | csum = btrfs_csum_data(kaddr + offset, csum, end - start + 1); |
2823 | btrfs_csum_final(csum, (char *)&csum); | 2823 | btrfs_csum_final(csum, (char *)&csum); |
2824 | if (csum != private) | 2824 | if (csum != private) |
2825 | goto zeroit; | 2825 | goto zeroit; |
@@ -6919,7 +6919,6 @@ static void btrfs_endio_direct_read(struct bio *bio, int err) | |||
6919 | struct bio_vec *bvec_end = bio->bi_io_vec + bio->bi_vcnt - 1; | 6919 | struct bio_vec *bvec_end = bio->bi_io_vec + bio->bi_vcnt - 1; |
6920 | struct bio_vec *bvec = bio->bi_io_vec; | 6920 | struct bio_vec *bvec = bio->bi_io_vec; |
6921 | struct inode *inode = dip->inode; | 6921 | struct inode *inode = dip->inode; |
6922 | struct btrfs_root *root = BTRFS_I(inode)->root; | ||
6923 | u64 start; | 6922 | u64 start; |
6924 | 6923 | ||
6925 | start = dip->logical_offset; | 6924 | start = dip->logical_offset; |
@@ -6936,7 +6935,7 @@ static void btrfs_endio_direct_read(struct bio *bio, int err) | |||
6936 | goto failed; | 6935 | goto failed; |
6937 | local_irq_save(flags); | 6936 | local_irq_save(flags); |
6938 | kaddr = kmap_atomic(page); | 6937 | kaddr = kmap_atomic(page); |
6939 | csum = btrfs_csum_data(root, kaddr + bvec->bv_offset, | 6938 | csum = btrfs_csum_data(kaddr + bvec->bv_offset, |
6940 | csum, bvec->bv_len); | 6939 | csum, bvec->bv_len); |
6941 | btrfs_csum_final(csum, (char *)&csum); | 6940 | btrfs_csum_final(csum, (char *)&csum); |
6942 | kunmap_atomic(kaddr); | 6941 | kunmap_atomic(kaddr); |