diff options
| author | Chris Mason | 2009-09-12 01:07:25 +0200 |
|---|---|---|
| committer | Chris Mason | 2009-09-12 01:07:25 +0200 |
| commit | 83ebade34bc1a90d0c3f77b87b940f336d075fda (patch) | |
| tree | 99b6366c52e6bec88119ae995399c985fc61e900 /fs/btrfs/relocation.c | |
| parent | Linux 2.6.31 (diff) | |
| parent | Btrfs: zero page past end of inline file items (diff) | |
| download | kernel-qcow2-linux-83ebade34bc1a90d0c3f77b87b940f336d075fda.tar.gz kernel-qcow2-linux-83ebade34bc1a90d0c3f77b87b940f336d075fda.tar.xz kernel-qcow2-linux-83ebade34bc1a90d0c3f77b87b940f336d075fda.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index c04f7f212602..3be16ccc7eea 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2180,7 +2180,7 @@ static int tree_block_processed(u64 bytenr, u32 blocksize, struct reloc_control *rc) { if (test_range_bit(&rc->processed_blocks, bytenr, - bytenr + blocksize - 1, EXTENT_DIRTY, 1)) + bytenr + blocksize - 1, EXTENT_DIRTY, 1, NULL)) return 1; return 0; } @@ -2646,9 +2646,9 @@ int relocate_data_extent(struct inode *inode, struct btrfs_key *extent_key) lock_extent(&BTRFS_I(inode)->io_tree, start, end, GFP_NOFS); while (1) { int ret; - spin_lock(&em_tree->lock); + write_lock(&em_tree->lock); ret = add_extent_mapping(em_tree, em); - spin_unlock(&em_tree->lock); + write_unlock(&em_tree->lock); if (ret != -EEXIST) { free_extent_map(em); break; |