From: Benny Halevy <bhalevy@panasas.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 2/2] pnfsd: mask out unsupported pnfs attributes only when !CONFIG_PNFSD
Date: Thu, 30 Sep 2010 21:20:52 +0200 [thread overview]
Message-ID: <1285874452-21522-1-git-send-email-bhalevy@panasas.com> (raw)
In-Reply-To: <1285872478-21045-1-git-send-email-bhalevy@panasas.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
---
fs/nfsd/nfs4xdr.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index f0dfa47..5e8e89d 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1906,9 +1906,11 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
.dentry = dentry,
};
+#if !defined(CONFIG_PNFSD)
/* mask out unsupported pNFS attributes */
bmval1 &= ~FATTR4_WORD1_FS_LAYOUT_TYPES;
bmval2 &= ~FATTR4_WORD2_LAYOUT_BLKSIZE;
+#endif /* !CONFIG_PNFSD */
BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
--
1.7.2.3
next prev parent reply other threads:[~2010-09-30 19:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 18:47 [PATCH 2/2] nfsd41: mask out unsupported pnfs attributes Benny Halevy
2010-09-30 19:20 ` [PATCH 1/2] SQUASHME: pnfsd: FATTR4_WORD2_LAYOUT_BLKSIZE is supported only under CONFIG_PNFSD Benny Halevy
2010-09-30 19:20 ` Benny Halevy [this message]
2010-10-01 14:48 ` [PATCH 2/2] nfsd41: mask out unsupported pnfs attributes J. Bruce Fields
2010-10-01 15:17 ` Benny Halevy
2010-10-01 15:20 ` J. Bruce Fields
2010-10-01 15:35 ` Benny Halevy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285874452-21522-1-git-send-email-bhalevy@panasas.com \
--to=bhalevy@panasas.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).