From 8f26cb565ddfc2354f4e711fb9905928172f7e9a Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Tue, 22 Jan 2013 15:43:09 -0500 Subject: [PATCH] --- yaml --- r: 349179 b: refs/heads/master c: e58dd74bccb4317e39e4b675bf9c6cd133608fac h: refs/heads/master i: 349177: c7c2285b82353bb8cd6d309e6b454b7ea34b0f10 349175: 007c14af30fecae5038046d1ae80819364c5521a v: v3 --- [refs] | 2 +- trunk/fs/btrfs/file-item.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9b8c74379317..4129f664558f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 192000dda22e02225772e862b92e7c09e5a17d08 +refs/heads/master: e58dd74bccb4317e39e4b675bf9c6cd133608fac diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c index bd38cef42358..94aa53b38721 100644 --- a/trunk/fs/btrfs/file-item.c +++ b/trunk/fs/btrfs/file-item.c @@ -460,8 +460,8 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode, if (!contig) offset = page_offset(bvec->bv_page) + bvec->bv_offset; - if (!contig && (offset >= ordered->file_offset + ordered->len || - offset < ordered->file_offset)) { + if (offset >= ordered->file_offset + ordered->len || + offset < ordered->file_offset) { unsigned long bytes_left; sums->len = this_sum_bytes; this_sum_bytes = 0;