From patchwork Thu Jan 22 14:27:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 5685671 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DEE7EC058E for ; Thu, 22 Jan 2015 14:36:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D186201F5 for ; Thu, 22 Jan 2015 14:36:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47AB9201CE for ; Thu, 22 Jan 2015 14:36:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753266AbbAVOeU (ORCPT ); Thu, 22 Jan 2015 09:34:20 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.229]:21450 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753441AbbAVO3S (ORCPT ); Thu, 22 Jan 2015 09:29:18 -0500 Received: from [107.15.97.250] ([107.15.97.250:43943] helo=tlielax.poochiereds.net) by cdptpa-oedge01 (envelope-from ) (ecelerity 3.5.0.35861 r(Momo-dev:tip)) with ESMTP id D1/A2-09108-3F801C45; Thu, 22 Jan 2015 14:28:03 +0000 From: Jeff Layton To: linux-fsdevel@vger.kernel.org Cc: Christoph Hellwig , Sasha Levin , David Howells , linux-kernel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org Subject: [PATCH v3 12/13] locks: consolidate NULL i_flctx checks in locks_remove_file Date: Thu, 22 Jan 2015 09:27:56 -0500 Message-Id: <1421936877-27529-13-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421936877-27529-1-git-send-email-jeff.layton@primarydata.com> References: <1421936877-27529-1-git-send-email-jeff.layton@primarydata.com> X-RR-Connecting-IP: 107.14.168.118:25 X-Cloudmark-Score: 0 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have each of the locks_remove_* variants doing this individually. Have the caller do it instead, and have locks_remove_flock and locks_remove_lease just assume that it's a valid pointer. Signed-off-by: Jeff Layton --- fs/locks.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index bd578700342d..2fc36b3772a0 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2400,6 +2400,7 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner) EXPORT_SYMBOL(locks_remove_posix); +/* The i_flctx must be valid when calling into here */ static void locks_remove_flock(struct file *filp) { @@ -2413,7 +2414,7 @@ locks_remove_flock(struct file *filp) }; struct file_lock_context *flctx = file_inode(filp)->i_flctx; - if (!flctx || list_empty(&flctx->flc_flock)) + if (list_empty(&flctx->flc_flock)) return; if (filp->f_op->flock) @@ -2425,6 +2426,7 @@ locks_remove_flock(struct file *filp) fl.fl_ops->fl_release_private(&fl); } +/* The i_flctx must be valid when calling into here */ static void locks_remove_lease(struct file *filp) { @@ -2433,7 +2435,7 @@ locks_remove_lease(struct file *filp) struct file_lock *fl, *tmp; LIST_HEAD(dispose); - if (!ctx || list_empty(&ctx->flc_lease)) + if (list_empty(&ctx->flc_lease)) return; spin_lock(&ctx->flc_lock); @@ -2448,6 +2450,9 @@ locks_remove_lease(struct file *filp) */ void locks_remove_file(struct file *filp) { + if (!file_inode(filp)->i_flctx) + return; + /* remove any OFD locks */ locks_remove_posix(filp, filp);