From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753376AbbCGMvb (ORCPT ); Sat, 7 Mar 2015 07:51:31 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.225]:60687 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752872AbbCGMv2 (ORCPT ); Sat, 7 Mar 2015 07:51:28 -0500 From: Jeff Layton To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, bfields@fieldses.org Subject: [PATCH] locks: fix generic_delete_lease tracepoint to use victim pointer Date: Sat, 7 Mar 2015 07:51:10 -0500 Message-Id: <1425732670-4890-1-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.1.0 X-RR-Connecting-IP: 107.14.168.118:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's possible that "fl" won't point at a valid lock at this point, so have it instead point at "victim" which is either a valid lock or NULL. Signed-off-by: Jeff Layton --- fs/locks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/locks.c b/fs/locks.c index 8f61ad524e3e..0915a3ead897 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1732,7 +1732,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); -- 2.1.0