aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorYan <yanzheng@21cn.com>2008-02-04 08:57:25 -0500
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:00 -0400
commitc2e639f02cff721172569add21ba5d058fd1a81c (patch)
treefeae72258a01f5360b0279c03b3dd1185cd662ac /fs/btrfs
parent80b6794d1153ed91a040d873396efb9bd60969fd (diff)
Btrfs: Fix typo in extent_io.c
--- Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/extent_io.c4
-rw-r--r--fs/btrfs/inode.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 5d2fb527fd96..36a943e51808 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1416,7 +1416,7 @@ static int end_bio_extent_writepage(struct bio *bio,
1416 * to the correct offsets in the file 1416 * to the correct offsets in the file
1417 */ 1417 */
1418 if (state && (state->end + 1 != start || 1418 if (state && (state->end + 1 != start ||
1419 !state->state & EXTENT_WRITEBACK)) { 1419 !(state->state & EXTENT_WRITEBACK))) {
1420 state = NULL; 1420 state = NULL;
1421 } 1421 }
1422 spin_unlock_irqrestore(&tree->lock, flags); 1422 spin_unlock_irqrestore(&tree->lock, flags);
@@ -1539,7 +1539,7 @@ static int end_bio_extent_readpage(struct bio *bio,
1539 * to the correct offsets in the file 1539 * to the correct offsets in the file
1540 */ 1540 */
1541 if (state && (state->end + 1 != start || 1541 if (state && (state->end + 1 != start ||
1542 !state->state & EXTENT_WRITEBACK)) { 1542 !(state->state & EXTENT_LOCKED))) {
1543 state = NULL; 1543 state = NULL;
1544 } 1544 }
1545 spin_unlock_irqrestore(&tree->lock, flags); 1545 spin_unlock_irqrestore(&tree->lock, flags);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index f13b1dbc0619..44fc94fee2c4 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -364,8 +364,7 @@ int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end,
364 if (btrfs_test_opt(root, NODATASUM) || 364 if (btrfs_test_opt(root, NODATASUM) ||
365 btrfs_test_flag(inode, NODATASUM)) 365 btrfs_test_flag(inode, NODATASUM))
366 return 0; 366 return 0;
367 367 if (state && state->start == start) {
368 if (state->start == start) {
369 private = state->private; 368 private = state->private;
370 ret = 0; 369 ret = 0;
371 } else { 370 } else {