diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-14 13:02:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-14 13:02:21 -0400 |
| commit | 0f0910a100951204a48052ce62ca72915511ecc6 (patch) | |
| tree | 7eecaf7e01e921db23027143851694dec6cdd748 | |
| parent | 0be952c13be80ccdd3cb0d1ba25099de9468ac1b (diff) | |
| parent | a9b1b455c519ee2fd6a4f9c069511e67b5be1ac4 (diff) | |
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.c | 2 |
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) | |||
| 1728 | break; | 1728 | break; |
| 1729 | } | 1729 | } |
| 1730 | } | 1730 | } |
| 1731 | trace_generic_delete_lease(inode, fl); | 1731 | trace_generic_delete_lease(inode, victim); |
| 1732 | if (victim) | 1732 | if (victim) |
| 1733 | error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose); | 1733 | error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose); |
| 1734 | spin_unlock(&ctx->flc_lock); | 1734 | spin_unlock(&ctx->flc_lock); |