From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v5 17/20] nfsd: have nfsd_test_lock use the nfsd_file cache Date: Mon, 5 Oct 2015 07:02:39 -0400 Message-ID: <1444042962-6947-18-git-send-email-jeff.layton@primarydata.com> References: <1444042962-6947-1-git-send-email-jeff.layton@primarydata.com> Cc: linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, Al Viro To: bfields@fieldses.org Return-path: Received: from mail-qg0-f50.google.com ([209.85.192.50]:35750 "EHLO mail-qg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751788AbbJELDF (ORCPT ); Mon, 5 Oct 2015 07:03:05 -0400 Received: by qgt47 with SMTP id 47so145709008qgt.2 for ; Mon, 05 Oct 2015 04:03:04 -0700 (PDT) In-Reply-To: <1444042962-6947-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index b72fa6816860..4348af408ccb 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5596,11 +5596,11 @@ out: */ static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock) { - struct file *file; - __be32 err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); + struct nfsd_file *nf; + __be32 err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_READ, &nf); if (!err) { - err = nfserrno(vfs_test_lock(file, lock)); - fput(file); + err = nfserrno(vfs_test_lock(nf->nf_file, lock)); + nfsd_file_put(nf); } return err; } -- 2.4.3