From patchwork Thu Jun 19 14:49:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4383661 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ECDF4BEEAA for ; Thu, 19 Jun 2014 14:51:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31D0020384 for ; Thu, 19 Jun 2014 14:51:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35DF920394 for ; Thu, 19 Jun 2014 14:51:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757913AbaFSOvQ (ORCPT ); Thu, 19 Jun 2014 10:51:16 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:48851 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757947AbaFSOvP (ORCPT ); Thu, 19 Jun 2014 10:51:15 -0400 Received: by mail-qa0-f46.google.com with SMTP id i13so2003655qae.19 for ; Thu, 19 Jun 2014 07:51:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MDNWUcwroRHWwgOYH94zkfDulMb4xNTrub8AgLIfnx8=; b=iuoHjXb0q29lpduBAhYrFIeDAuBlPn9QK54n1pw6Hfy7aYL4ue5Rqg41bl9FManGpb 6Wxbtm70S/p6YwI7t6ueFRnlqaTqPkJ232Hd826NIu6+QoxGIZ1I4hEFVtj6PtMwi211 KM949fI3mF3HSrGJAIxtc2RPBl67+p2jdjk3YLrmEBfJkyQts2sacoEnXiv4ZjIwUlEo W892eDjdxlcMj3b3zjTO6BU77iblqNjJ9FCV6JnZnad4qguLdWHIRQ4IqQauO9m/r2o3 tfEwGXDHtyTRUcYurFyTd/qXVTxdTNeV/Y/f49W3g2YK7K9HAz2XPdim5byLgiYv4iw0 awhg== X-Gm-Message-State: ALoCoQkyi3lvnN0nWym+/Q8CyE9UgCGquBSBT8EKghcCqn5saSq/P/6c73k/4INIoHdhBTTL4x4r X-Received: by 10.229.44.194 with SMTP id b2mr8000020qcf.0.1403189474943; Thu, 19 Jun 2014 07:51:14 -0700 (PDT) Received: from tlielax.poochiereds.net (cpe-107-015-124-230.nc.res.rr.com. [107.15.124.230]) by mx.google.com with ESMTPSA id r60sm3364044qgd.26.2014.06.19.07.51.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:51:14 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 012/104] NFSd: Clean up helper __release_lock_stateid Date: Thu, 19 Jun 2014 10:49:18 -0400 Message-Id: <1403189450-18729-13-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> References: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@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=ham 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 From: Trond Myklebust Use filp_close() instead of open coding Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 8b0aa9ea343d..f4c71bc96970 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -739,7 +739,8 @@ static void free_generic_stateid(struct nfs4_ol_stateid *stp) nfs4_free_stid(stateid_slab, &stp->st_stid); } -static void __release_lock_stateid(struct nfs4_ol_stateid *stp) +static void __release_lock_stateid(struct nfs4_lockowner *lo, + struct nfs4_ol_stateid *stp) { struct file *file; @@ -747,10 +748,8 @@ static void __release_lock_stateid(struct nfs4_ol_stateid *stp) unhash_generic_stateid(stp); unhash_stid(&stp->st_stid); file = find_any_file(stp->st_file); - if (file) { - locks_remove_posix(file, (fl_owner_t)lockowner(stp->st_stateowner)); - fput(file); - } + if (file) + filp_close(file, (fl_owner_t)lo); close_generic_stateid(stp); free_generic_stateid(stp); } @@ -764,7 +763,7 @@ static void unhash_lockowner(struct nfs4_lockowner *lo) while (!list_empty(&lo->lo_owner.so_stateids)) { stp = list_first_entry(&lo->lo_owner.so_stateids, struct nfs4_ol_stateid, st_perstateowner); - __release_lock_stateid(stp); + __release_lock_stateid(lo, stp); } } @@ -791,7 +790,7 @@ static void release_lock_stateid(struct nfs4_ol_stateid *stp) struct nfs4_lockowner *lo; lo = lockowner(stp->st_stateowner); - __release_lock_stateid(stp); + __release_lock_stateid(lo, stp); release_lockowner_if_empty(lo); }