diff --git a/[refs] b/[refs]
index 422040530971..8ec2a4919380 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98bc3149fad639c8f50c7110b961a2a2fe085eed
+refs/heads/master: c0da7aa1a2d8fcafe271a7077599253c8ed94bb2
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 570cd44fe91b..e9813bd7d556 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/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 @@ static void btrfs_endio_direct_write(struct bio *bio, int err)
 
 	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);
 }