summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-14 10:02:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-14 10:02:21 -0700
commit0f0910a100951204a48052ce62ca72915511ecc6 (patch)
tree7eecaf7e01e921db23027143851694dec6cdd748
parent0be952c13be80ccdd3cb0d1ba25099de9468ac1b (diff)
parenta9b1b455c519ee2fd6a4f9c069511e67b5be1ac4 (diff)
downloadlinux-0f0910a100951204a48052ce62ca72915511ecc6.tar.bz2
Merge tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux
Pull file locking bugfix from Jeff Layton: "Just a small fix for a potential problem in one of the lease tracepoints" * tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux: locks: fix generic_delete_lease tracepoint to use victim pointer
-rw-r--r--fs/locks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c
index f1bad681fc1c..528fedfda15e 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1728,7 +1728,7 @@ static int generic_delete_lease(struct file *filp, void *owner)
break;
}
}
- trace_generic_delete_lease(inode, fl);
+ trace_generic_delete_lease(inode, victim);
if (victim)
error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose);
spin_unlock(&ctx->flc_lock);