From patchwork Mon Jun 30 15:48:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4451321 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 74CA39F390 for ; Mon, 30 Jun 2014 15:51:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8167A2021F for ; Mon, 30 Jun 2014 15:51:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9154820379 for ; Mon, 30 Jun 2014 15:51:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754623AbaF3PvJ (ORCPT ); Mon, 30 Jun 2014 11:51:09 -0400 Received: from mail-qa0-f50.google.com ([209.85.216.50]:60743 "EHLO mail-qa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754624AbaF3PvI (ORCPT ); Mon, 30 Jun 2014 11:51:08 -0400 Received: by mail-qa0-f50.google.com with SMTP id m5so6459795qaj.23 for ; Mon, 30 Jun 2014 08:51:08 -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=TI7kTa5BbGBlX6gm4pT6xfE6lH30psqkBEBCOVp+zTs=; b=SD6kz++rT2gm58xFp46aohpyvQ2srwNcwPaSLYohLkCPK8GEur/E/zulu6O87kGTzf QEex3xicG5Ar0u8TPL7r+KlchysiHQmM5Uxnj6Pv1ZSZ12WQqXjxbbDWYMxF+PYis4gC FlSh1Ejulae1uJA1JxqwqH6wxLLdP4yPOJHucsAk8UJchXxnYd33W+oi3mJrYrio2iRp wfeQmgtpJErO3uGqrDrut+8wzXwjfClmL+dlvHTBun+jEQHs5reot8Itkqx+N6/07X2r Y4H84goORLbD1mvHLudlj9a/lCLFuDCfQxr66Blf4toWWpob5nZdSvDKB53sowFnozOf eIRw== X-Gm-Message-State: ALoCoQlLYdnUAeCdq79OmPRBKGHwnnEsUK/wDM7KGbsLw5zFg7BO0mvBXMNwrHrAUnvxvxLb8AL9 X-Received: by 10.140.49.76 with SMTP id p70mr57709852qga.86.1404143468042; Mon, 30 Jun 2014 08:51:08 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id m1sm32584105qaz.27.2014.06.30.08.51.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jun 2014 08:51:07 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 025/114] nfsd: refactor nfs4_file_get_access and nfs4_file_put_access Date: Mon, 30 Jun 2014 11:48:54 -0400 Message-Id: <1404143423-24381-26-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404143423-24381-1-git-send-email-jlayton@primarydata.com> References: <1404143423-24381-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 Have them take NFS4_SHARE_ACCESS_* flags instead of an open mode. This spares the callers from having to convert it themselves. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 58 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index b201f1c4695c..6d8be6c235ca 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -337,6 +337,20 @@ static unsigned int ownerstr_hashval(u32 clientid, struct xdr_netobj *ownername) #define FILE_HASH_BITS 8 #define FILE_HASH_SIZE (1 << FILE_HASH_BITS) +static int nfs4_access_to_omode(u32 access) +{ + switch (access & NFS4_SHARE_ACCESS_BOTH) { + case NFS4_SHARE_ACCESS_READ: + return O_RDONLY; + case NFS4_SHARE_ACCESS_WRITE: + return O_WRONLY; + case NFS4_SHARE_ACCESS_BOTH: + return O_RDWR; + } + WARN_ON_ONCE(1); + return O_RDONLY; +} + static unsigned int file_hashval(struct inode *ino) { /* XXX: why are we hashing on inode pointer, anyway? */ @@ -351,8 +365,15 @@ static void __nfs4_file_get_access(struct nfs4_file *fp, int oflag) atomic_inc(&fp->fi_access[oflag]); } -static void nfs4_file_get_access(struct nfs4_file *fp, int oflag) +static void nfs4_file_get_access(struct nfs4_file *fp, u32 access) { + int oflag = nfs4_access_to_omode(access); + + /* Note: relies on NFS4_SHARE_ACCESS_BOTH == READ|WRITE */ + access &= (NFS4_SHARE_ACCESS_READ|NFS4_SHARE_ACCESS_WRITE); + if (access == 0) + return; + if (oflag == O_RDWR) { __nfs4_file_get_access(fp, O_RDONLY); __nfs4_file_get_access(fp, O_WRONLY); @@ -386,8 +407,15 @@ static void __nfs4_file_put_access(struct nfs4_file *fp, int oflag) } } -static void nfs4_file_put_access(struct nfs4_file *fp, int oflag) +static void nfs4_file_put_access(struct nfs4_file *fp, u32 access) { + int oflag; + + access &= (NFS4_SHARE_ACCESS_READ|NFS4_SHARE_ACCESS_WRITE); + if (!access) + return; + + oflag = nfs4_access_to_omode(access); if (oflag == O_RDWR) { __nfs4_file_put_access(fp, O_RDONLY); __nfs4_file_put_access(fp, O_WRONLY); @@ -741,20 +769,6 @@ test_deny(u32 access, struct nfs4_ol_stateid *stp) return test_bit(access, &stp->st_deny_bmap); } -static int nfs4_access_to_omode(u32 access) -{ - switch (access & NFS4_SHARE_ACCESS_BOTH) { - case NFS4_SHARE_ACCESS_READ: - return O_RDONLY; - case NFS4_SHARE_ACCESS_WRITE: - return O_WRONLY; - case NFS4_SHARE_ACCESS_BOTH: - return O_RDWR; - } - WARN_ON_ONCE(1); - return O_RDONLY; -} - /* release all access and file references for a given stateid */ static void release_all_access(struct nfs4_ol_stateid *stp) @@ -763,8 +777,7 @@ release_all_access(struct nfs4_ol_stateid *stp) for (i = 1; i < 4; i++) { if (test_access(i, stp)) - nfs4_file_put_access(stp->st_file, - nfs4_access_to_omode(i)); + nfs4_file_put_access(stp->st_file, i); clear_access(i, stp); } } @@ -3291,7 +3304,7 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp, filp = NULL; } } - nfs4_file_get_access(fp, oflag); + nfs4_file_get_access(fp, open->op_share_access); spin_unlock(&fp->fi_lock); if (filp) fput(filp); @@ -3303,7 +3316,7 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp, return nfs_ok; out_put_access: - nfs4_file_put_access(fp, oflag); + nfs4_file_put_access(fp, open->op_share_access); out: return status; } @@ -4210,7 +4223,7 @@ static inline void nfs4_stateid_downgrade_bit(struct nfs4_ol_stateid *stp, u32 a { if (!test_access(access, stp)) return; - nfs4_file_put_access(stp->st_file, nfs4_access_to_omode(access)); + nfs4_file_put_access(stp->st_file, access); clear_access(access, stp); } @@ -4535,11 +4548,10 @@ check_lock_length(u64 offset, u64 length) static void get_lock_access(struct nfs4_ol_stateid *lock_stp, u32 access) { struct nfs4_file *fp = lock_stp->st_file; - int oflag = nfs4_access_to_omode(access); if (test_access(access, lock_stp)) return; - nfs4_file_get_access(fp, oflag); + nfs4_file_get_access(fp, access); set_access(access, lock_stp); }