From patchwork Mon Aug 29 18:51:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 1110312 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7TIsUDI015854 for ; Mon, 29 Aug 2011 18:55:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754762Ab1H2Sve (ORCPT ); Mon, 29 Aug 2011 14:51:34 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:57355 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752463Ab1H2Sve (ORCPT ); Mon, 29 Aug 2011 14:51:34 -0400 Received: by iabu26 with SMTP id u26so733149iab.19 for ; Mon, 29 Aug 2011 11:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=9UfvKisgqQQHRQ3BGe7+WWBNMN1BbMuin65PBkwDLIc=; b=voh+xAoL5THQQs7L21Ag+Rt9ZbC2h8AkHSSuEt8J8cYGyRCBpXWLwsreDEEqZkqgOe 0GmIvUlb/qbT7cKZ9+vzkHl68q9nwgCkOpGc1uAgSt7M7Idc78cZPdJCH7M7GE/7r68J o/0fHJIwHhw/vLztiO2SZSvKO0xq8Tav5tMjI= Received: by 10.231.8.196 with SMTP id i4mr9304867ibi.65.1314643878045; Mon, 29 Aug 2011 11:51:18 -0700 (PDT) Received: from matisse.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net [99.26.161.222]) by mx.google.com with ESMTPS id k4sm1892312ibg.48.2011.08.29.11.51.16 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Aug 2011 11:51:17 -0700 (PDT) From: Chuck Lever Subject: [PATCH] NFSD: Add a cache for fs_locations information To: bfields@redhat.com Cc: linux-nfs@vger.kernel.org Date: Mon, 29 Aug 2011 14:51:15 -0400 Message-ID: <20110829185115.3413.92459.stgit@matisse.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 29 Aug 2011 18:55:10 +0000 (UTC) From: Trond Myklebust Signed-off-by: Trond Myklebust [ cel: since this is server-side, use nfsd4_ prefix instead of nfs4_ prefix. ] Signed-off-by: Chuck Lever --- fs/nfsd/nfsd.h | 7 +++++++ fs/nfsd/vfs.c | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" 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/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 7ecfa24..d314812 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -335,6 +335,13 @@ static inline u32 nfsd_suppattrs2(u32 minorversion) #define NFSD_SUPPATTR_EXCLCREAT_WORD2 \ NFSD_WRITEABLE_ATTRS_WORD2 +extern int nfsd4_is_junction(struct dentry *dentry); +#else +static inline int nfsd4_is_junction(struct dentry *dentry) +{ + return 0; +} + #endif /* CONFIG_NFSD_V4 */ #endif /* LINUX_NFSD_NFSD_H */ diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index fd0acca..5dac667 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -168,6 +168,8 @@ int nfsd_mountpoint(struct dentry *dentry, struct svc_export *exp) { if (d_mountpoint(dentry)) return 1; + if (nfsd4_is_junction(dentry)) + return 1; if (!(exp->ex_flags & NFSEXP_V4ROOT)) return 0; return dentry->d_inode != NULL; @@ -592,6 +594,19 @@ nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry, struct nfs4_ac return error; } +#define NFSD_XATTR_JUNCTION_PREFIX XATTR_TRUSTED_PREFIX "junction." +#define NFSD_XATTR_JUNCTION_TYPE NFSD_XATTR_JUNCTION_PREFIX "type" +int nfsd4_is_junction(struct dentry *dentry) +{ + ssize_t ret; + + if (dentry->d_inode != NULL) { + ret = vfs_getxattr(dentry, NFSD_XATTR_JUNCTION_TYPE, NULL, 0); + if (ret > 0) + return 1; + } + return 0; +} #endif /* defined(CONFIG_NFSD_V4) */ #ifdef CONFIG_NFSD_V3