From patchwork Thu Mar 5 05:21:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 5943501 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 7DA349F380 for ; Thu, 5 Mar 2015 05:23:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9768D202BE for ; Thu, 5 Mar 2015 05:23:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFA1C202B8 for ; Thu, 5 Mar 2015 05:23:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753662AbbCEFXf (ORCPT ); Thu, 5 Mar 2015 00:23:35 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42196 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753637AbbCEFXd (ORCPT ); Thu, 5 Mar 2015 00:23:33 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id BBEEAAC77; Thu, 5 Mar 2015 05:23:31 +0000 (UTC) From: NeilBrown To: Alexander Viro Date: Thu, 05 Mar 2015 16:21:21 +1100 Subject: [PATCH 9/9] NFS: support LOOKUP_RCU in nfs_follow_link. Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Message-ID: <20150305052121.23906.19303.stgit@notabene.brown> In-Reply-To: <20150305051530.23906.65097.stgit@notabene.brown> References: <20150305051530.23906.65097.stgit@notabene.brown> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@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=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 If the inode is valid and the page has been read in, then we can follow a link in RCU-walk. Signed-off-by: NeilBrown --- fs/nfs/inode.c | 22 ++++++++++++++++++++++ fs/nfs/symlink.c | 19 +++++++++++++++++-- include/linux/nfs_fs.h | 1 + 3 files changed, 40 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 83107be3dd01..80f192405102 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1123,6 +1123,28 @@ out: return ret; } +int nfs_revalidate_mapping_rcu(struct inode *inode) +{ + struct nfs_inode *nfsi = NFS_I(inode); + unsigned long *bitlock = &nfsi->flags; + int ret = 0; + + if (IS_SWAPFILE(inode)) + goto out; + if (nfs_mapping_need_revalidate_inode(inode)) { + ret = -ECHILD; + goto out; + } + spin_lock(&inode->i_lock); + if (test_bit(NFS_INO_INVALIDATING, bitlock) || + (nfsi->cache_validity & NFS_INO_INVALID_DATA)) + ret = -ECHILD; + spin_unlock(&inode->i_lock); +out: + return ret; +} + + static unsigned long nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr) { struct nfs_inode *nfsi = NFS_I(inode); diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c index c9a2d3cc4619..3cd295b7e094 100644 --- a/fs/nfs/symlink.c +++ b/fs/nfs/symlink.c @@ -49,8 +49,23 @@ static void *nfs_follow_link(struct dentry *dentry, struct nameidata *nd) struct page *page; void *err; - if (nd_is_rcu(nd)) - return ERR_PTR(-ECHILD); + if (nd_is_rcu(nd)) { + err = ERR_PTR(nfs_revalidate_mapping_rcu(inode)); + if (err) + goto read_failed; + page = find_get_page(inode->i_mapping, 0); + if (page && + (!PageUptodate(page) || PageHighMem(page))) { + put_page(page); + page = NULL; + } + if (!page) { + err = ERR_PTR(-ECHILD); + goto read_failed; + } + nd_set_link(nd, page_address(page)); + return page; + } err = ERR_PTR(nfs_revalidate_mapping(inode, inode->i_mapping)); if (err) goto read_failed; diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 2f77e0c651c8..78c2f812eaeb 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -355,6 +355,7 @@ extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode); extern int nfs_revalidate_inode_rcu(struct nfs_server *server, struct inode *inode); extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *); extern int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping); +extern int nfs_revalidate_mapping_rcu(struct inode *inode); extern int nfs_setattr(struct dentry *, struct iattr *); extern void nfs_setattr_update_inode(struct inode *inode, struct iattr *attr); extern void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr,