Browse Source

Btrfs: don't wait on uptodate buffers on read

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Chris Mason 18 years ago
parent
commit
9d64272cd3
1 changed files with 3 additions and 0 deletions
  1. 3 0
      fs/btrfs/disk-io.c

+ 3 - 0
fs/btrfs/disk-io.c

@@ -214,6 +214,8 @@ struct buffer_head *read_tree_block(struct btrfs_root *root, u64 blocknr)
 	bh = btrfs_find_create_tree_block(root, blocknr);
 	bh = btrfs_find_create_tree_block(root, blocknr);
 	if (!bh)
 	if (!bh)
 		return bh;
 		return bh;
+	if (buffer_uptodate(bh))
+		goto uptodate;
 	lock_buffer(bh);
 	lock_buffer(bh);
 	if (!buffer_uptodate(bh)) {
 	if (!buffer_uptodate(bh)) {
 		get_bh(bh);
 		get_bh(bh);
@@ -226,6 +228,7 @@ struct buffer_head *read_tree_block(struct btrfs_root *root, u64 blocknr)
 	} else {
 	} else {
 		unlock_buffer(bh);
 		unlock_buffer(bh);
 	}
 	}
+uptodate:
 	if (check_tree_block(root, bh))
 	if (check_tree_block(root, bh))
 		BUG();
 		BUG();
 	return bh;
 	return bh;