summaryrefslogtreecommitdiffstats
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
parent98bc3149fad639c8f50c7110b961a2a2fe085eed (diff)
downloadlinux-stable-c0da7aa1a2d8fcafe271a7077599253c8ed94bb2.tar.gz
linux-stable-c0da7aa1a2d8fcafe271a7077599253c8ed94bb2.tar.bz2
linux-stable-c0da7aa1a2d8fcafe271a7077599253c8ed94bb2.zip
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>
-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)
kfree(dip->csums);
kfree(dip);
+
+ /* If we had a csum failure make sure to clear the uptodate flag */
+ if (err)
+ clear_bit(BIO_UPTODATE, &bio->bi_flags);
dio_end_io(bio, err);
}
@@ -5845,6 +5849,10 @@ out_done:
kfree(dip->csums);
kfree(dip);
+
+ /* If we had an error make sure to clear the uptodate flag */
+ if (err)
+ clear_bit(BIO_UPTODATE, &bio->bi_flags);
dio_end_io(bio, err);
}