diff --git a/[refs] b/[refs] index d620b990ac0f..c60208693d2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff0a5836ac48554b9f3b9d3c5f5bce4ddea11f1f +refs/heads/master: 3e7ad38d20ad113158d1b4c9de0f51c04f50d4f7 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index e68ef7b456b0..a850c3ac196d 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -1413,8 +1413,6 @@ static int bio_ready_for_csum(struct bio *bio) ret = extent_range_uptodate(io_tree, start + length, start + buf_len - 1); - if (ret == 1) - return ret; return ret; }