From patchwork Tue Jul 22 16:49:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4604281 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 0DDCF9F295 for ; Tue, 22 Jul 2014 16:49:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 316AF20158 for ; Tue, 22 Jul 2014 16:49:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52F432015A for ; Tue, 22 Jul 2014 16:49:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756329AbaGVQty (ORCPT ); Tue, 22 Jul 2014 12:49:54 -0400 Received: from mail-qa0-f41.google.com ([209.85.216.41]:47325 "EHLO mail-qa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756323AbaGVQtx (ORCPT ); Tue, 22 Jul 2014 12:49:53 -0400 Received: by mail-qa0-f41.google.com with SMTP id j7so7014837qaq.14 for ; Tue, 22 Jul 2014 09:49:53 -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=JUvnp1BQnR3l1FpTOJivVi2QitVKvbo3gZFce3Xm5nA=; b=Or2nr6sblD3suMV2LSHJslP3+Z/2P2Dq80HUi/7OycjbujMsufVOkAkubowHor83S4 C7bUKegKWYydXrX0VAs3d+pI9Q3+9nda/WRZ5Eu8NqyswAyAK7ZyaApZyvQUyOrNGiO1 Wednqum1HlgPrx51QVr+lIWqKLhxKe1bl9z4+vdZCudWha56kh63s+HBncNPQvm4FxEd pHyXihe1HyEqEwDxdWtdh4YekWTxHy8U86F/8Gogdk1ahXXKoWHPgyQUOuCF8b5C07y8 4zERwVfDHz0SreP6jZivg6LEroXyrfqroan9IkSvcS4epYRcGQbCxP0SOdEHOYs9eA67 VFkA== X-Gm-Message-State: ALoCoQmrtlkHnSNQ+BGiSbQN2Qgx2f2v6qOq0/+HIbubQb29tjazYFXsjI7s8da3QEDhaXHmE+qZ X-Received: by 10.140.82.113 with SMTP id g104mr52324660qgd.55.1406047793090; Tue, 22 Jul 2014 09:49:53 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id x9sm1166175qas.26.2014.07.22.09.49.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jul 2014 09:49:52 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, trond.myklebust@primarydata.com, hch@infradead.org Subject: [PATCH 2/4] nfsd: Use the filehandle to look up the struct nfs4_file instead of inode Date: Tue, 22 Jul 2014 12:49:42 -0400 Message-Id: <1406047784-1578-3-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406047784-1578-1-git-send-email-jlayton@primarydata.com> References: <1406047784-1578-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, 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 This makes more sense anyway since an inode pointer value can change even when the filehandle doesn't. Signed-off-by: Trond Myklebust Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 393cd83a4f42..c540a46f6305 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -368,10 +368,22 @@ 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 unsigned int file_hashval(struct inode *ino) +static unsigned int nfsd_fh_hashval(struct knfsd_fh *fh) { - /* XXX: why are we hashing on inode pointer, anyway? */ - return hash_ptr(ino, FILE_HASH_BITS); + return jhash2(fh->fh_base.fh_pad, XDR_QUADLEN(fh->fh_size), 0); +} + +static unsigned int file_hashval(struct knfsd_fh *fh) +{ + return nfsd_fh_hashval(fh) & (FILE_HASH_SIZE - 1); +} + +static bool nfsd_fh_match(struct knfsd_fh *fh1, struct knfsd_fh *fh2) +{ + return fh1->fh_size == fh2->fh_size && + !memcmp(fh1->fh_base.fh_pad, + fh2->fh_base.fh_pad, + fh1->fh_size); } static struct hlist_head file_hashtbl[FILE_HASH_SIZE]; @@ -2836,7 +2848,7 @@ static struct nfs4_file *nfsd4_alloc_file(void) static void nfsd4_init_file(struct nfs4_file *fp, struct inode *ino, struct knfsd_fh *fh) { - unsigned int hashval = file_hashval(ino); + unsigned int hashval = file_hashval(fh); lockdep_assert_held(&state_lock); @@ -3025,15 +3037,15 @@ find_openstateowner_str(unsigned int hashval, struct nfsd4_open *open, /* search file_hashtbl[] for file */ static struct nfs4_file * -find_file_locked(struct inode *ino) +find_file_locked(struct knfsd_fh *fh) { - unsigned int hashval = file_hashval(ino); + unsigned int hashval = file_hashval(fh); struct nfs4_file *fp; lockdep_assert_held(&state_lock); hlist_for_each_entry(fp, &file_hashtbl[hashval], fi_hash) { - if (fp->fi_inode == ino) { + if (nfsd_fh_match(&fp->fi_fhandle, fh)) { get_nfs4_file(fp); return fp; } @@ -3042,12 +3054,12 @@ find_file_locked(struct inode *ino) } static struct nfs4_file * -find_file(struct inode *ino) +find_file(struct knfsd_fh *fh) { struct nfs4_file *fp; spin_lock(&state_lock); - fp = find_file_locked(ino); + fp = find_file_locked(fh); spin_unlock(&state_lock); return fp; } @@ -3058,7 +3070,7 @@ find_or_add_file(struct inode *ino, struct nfs4_file *new, struct knfsd_fh *fh) struct nfs4_file *fp; spin_lock(&state_lock); - fp = find_file_locked(ino); + fp = find_file_locked(fh); if (fp == NULL) { nfsd4_init_file(new, ino, fh); fp = new; @@ -3075,11 +3087,10 @@ find_or_add_file(struct inode *ino, struct nfs4_file *new, struct knfsd_fh *fh) static __be32 nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type) { - struct inode *ino = current_fh->fh_dentry->d_inode; struct nfs4_file *fp; __be32 ret = nfs_ok; - fp = find_file(ino); + fp = find_file(¤t_fh->fh_handle); if (!fp) return ret; /* Check for conflicting share reservations */