aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2011-03-22 11:05:07 -0400
committerChris Mason <chris.mason@oracle.com>2011-03-25 19:08:19 -0400
commitc0da7aa1a2d8fcafe271a7077599253c8ed94bb2 (patch)
tree232a22b93eb56090c5a0ecdba377ffb761d5549c /fs/btrfs
parent98bc3149fad639c8f50c7110b961a2a2fe085eed (diff)
Btrfs: mark the bio with an error if we have a failure in dio
I noticed that dio_end_io calls the appropriate endio function with an error, but the endio functions don't actually do anything with that error, they assume that if there was an error then the bio will not be uptodate. So if we had checksum failures we would never pass back EIO. So if there is an error in our endio functions make sure to clear the uptodate flag on the bio. Thanks, Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/inode.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 570cd44fe91b..e9813bd7d556 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -5744,6 +5744,10 @@ static void btrfs_endio_direct_read(struct bio *bio, int err)
5744 5744
5745 kfree(dip->csums); 5745 kfree(dip->csums);
5746 kfree(dip); 5746 kfree(dip);
5747
5748 /* If we had a csum failure make sure to clear the uptodate flag */
5749 if (err)
5750 clear_bit(BIO_UPTODATE, &bio->bi_flags);
5747 dio_end_io(bio, err); 5751 dio_end_io(bio, err);
5748} 5752}
5749 5753
@@ -5845,6 +5849,10 @@ out_done:
5845 5849
5846 kfree(dip->csums); 5850 kfree(dip->csums);
5847 kfree(dip); 5851 kfree(dip);
5852
5853 /* If we had an error make sure to clear the uptodate flag */
5854 if (err)
5855 clear_bit(BIO_UPTODATE, &bio->bi_flags);
5848 dio_end_io(bio, err); 5856 dio_end_io(bio, err);
5849} 5857}
5850 5858