diff options
| author | Linus Torvalds | 2012-06-21 22:41:07 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-06-21 22:41:07 +0200 |
| commit | 8874e812feb4926f4a51a82c4fca75c7daa05fc5 (patch) | |
| tree | bd3f4cc08e6e32e3d6f687a0e51590d4ab0faacb /fs/btrfs/disk-io.c | |
| parent | Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Btrfs: delay iput with async extents (diff) | |
| download | kernel-qcow2-linux-8874e812feb4926f4a51a82c4fca75c7daa05fc5.tar.gz kernel-qcow2-linux-8874e812feb4926f4a51a82c4fca75c7daa05fc5.tar.xz kernel-qcow2-linux-8874e812feb4926f4a51a82c4fca75c7daa05fc5.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"This is a small pull with btrfs fixes. The biggest of the bunch is
another fix for the new backref walking code.
We're still hammering out one btrfs dio vs buffered reads problem, but
that one will have to wait for the next rc."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: delay iput with async extents
Btrfs: add a missing spin_lock
Btrfs: don't assume to be on the correct extent in add_all_parents
Btrfs: introduce btrfs_next_old_item
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e1890b1d3075..7b845ff4af99 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3426,6 +3426,7 @@ int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans, mutex_unlock(&head->mutex); btrfs_put_delayed_ref(ref); + spin_lock(&delayed_refs->lock); continue; } |