diff options
| author | James Morris | 2012-09-28 05:37:32 +0200 |
|---|---|---|
| committer | James Morris | 2012-09-28 05:37:32 +0200 |
| commit | bf5308344527d015ac9a6d2bda4ad4d40fd7d943 (patch) | |
| tree | 566e61e2cfc648c374d15cfc8c661b73e1a471f8 /fs/btrfs/locking.c | |
| parent | Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next (diff) | |
| parent | Linux 3.6-rc7 (diff) | |
| download | kernel-qcow2-linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.tar.gz kernel-qcow2-linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.tar.xz kernel-qcow2-linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.zip | |
Merge tag 'v3.6-rc7' into next
Linux 3.6-rc7
Requested by David Howells so he can merge his key susbsystem work into
my tree with requisite -linus changesets.
Diffstat (limited to 'fs/btrfs/locking.c')
| -rw-r--r-- | fs/btrfs/locking.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c index a44eff074805..2a1762c66041 100644 --- a/fs/btrfs/locking.c +++ b/fs/btrfs/locking.c @@ -67,7 +67,7 @@ void btrfs_clear_lock_blocking_rw(struct extent_buffer *eb, int rw) { if (eb->lock_nested) { read_lock(&eb->lock); - if (&eb->lock_nested && current->pid == eb->lock_owner) { + if (eb->lock_nested && current->pid == eb->lock_owner) { read_unlock(&eb->lock); return; } |