diff options
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 82fdda8ff5ab..10a8d08d3d29 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -7828,7 +7828,6 @@ static void btrfs_retry_endio_nocsum(struct bio *bio) | |||
7828 | struct inode *inode = done->inode; | 7828 | struct inode *inode = done->inode; |
7829 | struct bio_vec *bvec; | 7829 | struct bio_vec *bvec; |
7830 | struct extent_io_tree *io_tree, *failure_tree; | 7830 | struct extent_io_tree *io_tree, *failure_tree; |
7831 | int i; | ||
7832 | struct bvec_iter_all iter_all; | 7831 | struct bvec_iter_all iter_all; |
7833 | 7832 | ||
7834 | if (bio->bi_status) | 7833 | if (bio->bi_status) |
@@ -7841,7 +7840,7 @@ static void btrfs_retry_endio_nocsum(struct bio *bio) | |||
7841 | 7840 | ||
7842 | done->uptodate = 1; | 7841 | done->uptodate = 1; |
7843 | ASSERT(!bio_flagged(bio, BIO_CLONED)); | 7842 | ASSERT(!bio_flagged(bio, BIO_CLONED)); |
7844 | bio_for_each_segment_all(bvec, bio, i, iter_all) | 7843 | bio_for_each_segment_all(bvec, bio, iter_all) |
7845 | clean_io_failure(BTRFS_I(inode)->root->fs_info, failure_tree, | 7844 | clean_io_failure(BTRFS_I(inode)->root->fs_info, failure_tree, |
7846 | io_tree, done->start, bvec->bv_page, | 7845 | io_tree, done->start, bvec->bv_page, |
7847 | btrfs_ino(BTRFS_I(inode)), 0); | 7846 | btrfs_ino(BTRFS_I(inode)), 0); |
@@ -7919,7 +7918,7 @@ static void btrfs_retry_endio(struct bio *bio) | |||
7919 | struct bio_vec *bvec; | 7918 | struct bio_vec *bvec; |
7920 | int uptodate; | 7919 | int uptodate; |
7921 | int ret; | 7920 | int ret; |
7922 | int i; | 7921 | int i = 0; |
7923 | struct bvec_iter_all iter_all; | 7922 | struct bvec_iter_all iter_all; |
7924 | 7923 | ||
7925 | if (bio->bi_status) | 7924 | if (bio->bi_status) |
@@ -7934,7 +7933,7 @@ static void btrfs_retry_endio(struct bio *bio) | |||
7934 | failure_tree = &BTRFS_I(inode)->io_failure_tree; | 7933 | failure_tree = &BTRFS_I(inode)->io_failure_tree; |
7935 | 7934 | ||
7936 | ASSERT(!bio_flagged(bio, BIO_CLONED)); | 7935 | ASSERT(!bio_flagged(bio, BIO_CLONED)); |
7937 | bio_for_each_segment_all(bvec, bio, i, iter_all) { | 7936 | bio_for_each_segment_all(bvec, bio, iter_all) { |
7938 | ret = __readpage_endio_check(inode, io_bio, i, bvec->bv_page, | 7937 | ret = __readpage_endio_check(inode, io_bio, i, bvec->bv_page, |
7939 | bvec->bv_offset, done->start, | 7938 | bvec->bv_offset, done->start, |
7940 | bvec->bv_len); | 7939 | bvec->bv_len); |
@@ -7946,6 +7945,7 @@ static void btrfs_retry_endio(struct bio *bio) | |||
7946 | bvec->bv_offset); | 7945 | bvec->bv_offset); |
7947 | else | 7946 | else |
7948 | uptodate = 0; | 7947 | uptodate = 0; |
7948 | i++; | ||
7949 | } | 7949 | } |
7950 | 7950 | ||
7951 | done->uptodate = uptodate; | 7951 | done->uptodate = uptodate; |