Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f0910a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0be952c1 a9b1b455
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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);