From patchwork Tue Nov 17 11:52:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7636111 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 177009F1D3 for ; Tue, 17 Nov 2015 11:53:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 42DB4204E2 for ; Tue, 17 Nov 2015 11:53:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D5CB204EC for ; Tue, 17 Nov 2015 11:53:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753550AbbKQLxr (ORCPT ); Tue, 17 Nov 2015 06:53:47 -0500 Received: from mail-qk0-f181.google.com ([209.85.220.181]:36847 "EHLO mail-qk0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753333AbbKQLxh (ORCPT ); Tue, 17 Nov 2015 06:53:37 -0500 Received: by qkda6 with SMTP id a6so1675693qkd.3 for ; Tue, 17 Nov 2015 03:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds_net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/Z56UsOPE5kVx85BhRAah97tMOCMTb3y8aHTC0KWXmA=; b=pnPT6wXNWe4aN264fKTeuY1okVMKthbvpwBJxZsPBowaUXK51xmcKi25j3bymqTIdK L906t6JdhZB/4BpdB4rD3PzlUXBYY5A8dkhOAk3My3l5wtryuu9g1mRz5xFa0ZoWANlt 3Dut6MCIWva8H48mRj178ijFoNEhkO7dXz+sZ8UMHgk1Jjy4Bx4AMK725eznoiyfBNtg rnTK3mBQzYWXNyEXjOa6XJtSAzYY4+e4fQZ2GT69zsd5oO3mDVcrfcXZYek66H4jMDs+ VpHKuGsFY5bFz2cdkHW7IQblY4uFEhamUoQdXZ1DrTukgxmiImglOBiFo8OThof70aYA 7rrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/Z56UsOPE5kVx85BhRAah97tMOCMTb3y8aHTC0KWXmA=; b=IcA0sDzlUPJA9Bt6uM5aGjEeamvBK4kwuSGlbng/wjwA9VE0FRIrI/x7QeJ/ISd00r j7U1L6qs0ewjExc0x/Qw+llJ6s1ijEX8ky6oHV5cf3hp23fq1J0kQe7YwEvxSo8f6KhC xC2z98dTx80KopIRpH300YtgSDmOpT6MsNT5zaqcOlX5pF/7sB12wzJb5Mtq/nCqYkYG X0SdTcPpKtGW+lG2WQ9vmQtnsg1hFr6qGl8ZW4AhQD8pe2uqa3CG3sex9drYeZ/SGStj 9MBgyLwibIVjwwd0FoGlCC/YxFGD4sfPeKgS7N4AF7JBsq7h+tJjJlEK+J7nX33LUc4A EElA== X-Gm-Message-State: ALoCoQlclC/zTp800hewksod7iBF71RHngtUxhSfihbKZywnkuVQ0MwAdK8/BuUvhmnwXrbFbBKN X-Received: by 10.55.19.213 with SMTP id 82mr41855143qkt.51.1447761216367; Tue, 17 Nov 2015 03:53:36 -0800 (PST) Received: from tlielax.poochiereds.net ([2606:a000:1125:4075::d5a]) by smtp.googlemail.com with ESMTPSA id w10sm1583910qhc.16.2015.11.17.03.53.35 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Nov 2015 03:53:35 -0800 (PST) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org, trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Eric Paris , Alexander Viro , linux-fsdevel@vger.kernel.org Subject: [PATCH v1 18/38] nfsd: convert nfs4_file->fi_fds array to use nfsd_files Date: Tue, 17 Nov 2015 06:52:40 -0500 Message-Id: <1447761180-4250-19-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> References: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 23 ++++++++++++----------- fs/nfsd/state.h | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6b800b5b8fed..e7adb6b60005 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -49,6 +49,7 @@ #include "netns.h" #include "pnfs.h" +#include "filecache.h" #define NFSDDBG_FACILITY NFSDDBG_PROC @@ -292,7 +293,7 @@ static struct file * __nfs4_get_fd(struct nfs4_file *f, int oflag) { if (f->fi_fds[oflag]) - return get_file(f->fi_fds[oflag]); + return get_file(f->fi_fds[oflag]->nf_file); return NULL; } @@ -449,17 +450,17 @@ static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag) might_lock(&fp->fi_lock); if (atomic_dec_and_lock(&fp->fi_access[oflag], &fp->fi_lock)) { - struct file *f1 = NULL; - struct file *f2 = NULL; + struct nfsd_file *f1 = NULL; + struct nfsd_file *f2 = NULL; swap(f1, fp->fi_fds[oflag]); if (atomic_read(&fp->fi_access[1 - oflag]) == 0) swap(f2, fp->fi_fds[O_RDWR]); spin_unlock(&fp->fi_lock); if (f1) - fput(f1); + nfsd_file_put(f1); if (f2) - fput(f2); + nfsd_file_put(f2); } } @@ -3915,7 +3916,7 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp, struct svc_fh *cur_fh, struct nfs4_ol_stateid *stp, struct nfsd4_open *open) { - struct file *filp = NULL; + struct nfsd_file *nf = NULL; __be32 status; int oflag = nfs4_access_to_omode(open->op_share_access); int access = nfs4_access_to_access(open->op_share_access); @@ -3951,18 +3952,18 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp, if (!fp->fi_fds[oflag]) { spin_unlock(&fp->fi_lock); - status = nfsd_open(rqstp, cur_fh, S_IFREG, access, &filp); + status = nfsd_file_acquire(rqstp, cur_fh, access, &nf); if (status) goto out_put_access; spin_lock(&fp->fi_lock); if (!fp->fi_fds[oflag]) { - fp->fi_fds[oflag] = filp; - filp = NULL; + fp->fi_fds[oflag] = nf; + nf = NULL; } } spin_unlock(&fp->fi_lock); - if (filp) - fput(filp); + if (nf) + nfsd_file_put(nf); status = nfsd4_truncate(rqstp, cur_fh, open); if (status) diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 77fdf4de91ba..473faa436e07 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -491,7 +491,7 @@ struct nfs4_file { }; struct list_head fi_clnt_odstate; /* One each for O_RDONLY, O_WRONLY, O_RDWR: */ - struct file * fi_fds[3]; + struct nfsd_file *fi_fds[3]; /* * Each open or lock stateid contributes 0-4 to the counts * below depending on which bits are set in st_access_bitmap: