diff options
| author | Yan <yanzheng@21cn.com> | 2008-07-24 18:18:16 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 17:04:05 +0200 |
| commit | 974e35a82d022434efa50fe5f805ae14c542ba8c (patch) | |
| tree | be21c7139c573ad57d69cd81344161a6b5e21cef /fs/btrfs/extent-tree.c | |
| parent | Btrfs: Remove unused variable in fixup_tree_root_location (diff) | |
| download | linux-974e35a82d022434efa50fe5f805ae14c542ba8c.tar.xz linux-974e35a82d022434efa50fe5f805ae14c542ba8c.zip | |
Btrfs: Properly release lock in pin_down_bytes
When buffer isn't uptodate, pin_down_bytes may leave the tree locked
after it returns.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index e6a3ba9dd107..cdfb4ff4b459 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1485,8 +1485,8 @@ static int pin_down_bytes(struct btrfs_root *root, u64 bytenr, u32 num_bytes, struct extent_buffer *buf; buf = btrfs_find_tree_block(root, bytenr, num_bytes); if (buf) { - if (btrfs_try_tree_lock(buf) && - btrfs_buffer_uptodate(buf, 0)) { + if (btrfs_buffer_uptodate(buf, 0) && + btrfs_try_tree_lock(buf)) { u64 transid = root->fs_info->running_transaction->transid; u64 header_transid = |