Merge tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux

torvalds · torvalds · commit 0f0910a10095 · 2015-03-14T10:02:21.000-07:00
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
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1728,7 +1728,7 @@ static int generic_delete_lease(struct file filp, void owner)`
`1728`	`1728`	`break;`
`1729`	`1729`	`}`
`1730`	`1730`	`}`
`1731`		`- trace_generic_delete_lease(inode, fl);`
	`1731`	`+ trace_generic_delete_lease(inode, victim);`
`1732`	`1732`	`if (victim)`
`1733`	`1733`	`error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose);`
`1734`	`1734`	`spin_unlock(&ctx->flc_lock);`