Skip to content

Commit

Permalink
Merge tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
torvalds committed Mar 14, 2015
2 parents 0be952c + a9b1b45 commit 0f0910a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 0f0910a

Please sign in to comment.