From: Bas Peters <baspeters93@gmail.com>
To: bfields@fieldses.org
Cc: Bas Peters <baspeters93@gmail.com>,
hch@lst.de, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org, linux@roeck-us.net,
linux-next@vger.kernel.org
Subject: [PATCH] fs: nfsd:xdr4.h: add missing conditional group CONFIG_NFSD_V3
Date: Thu, 12 Feb 2015 23:09:13 +0100 [thread overview]
Message-ID: <1423778953-28307-1-git-send-email-baspeters93@gmail.com> (raw)
This patch adds a missing conditional group that has been causing build
breakages due to undefined struct members being referenced when
CONFIG_NFSD_v3 is not set.
This patch applies against linux-next.
Signed-off-by: Bas Peters <baspeters93@gmail.com>
---
fs/nfsd/xdr4.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
index 0bda93e..5d1597f 100644
--- a/fs/nfsd/xdr4.h
+++ b/fs/nfsd/xdr4.h
@@ -630,9 +630,11 @@ void warn_on_nonidempotent_op(struct nfsd4_op *op);
static inline void
set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp)
{
+ cinfo->change_supported = IS_I_VERSION(fhp->fh_dentry->d_inode);
+
+#ifdef CONFIG_NFSD_V3
BUG_ON(!fhp->fh_pre_saved);
cinfo->atomic = fhp->fh_post_saved;
- cinfo->change_supported = IS_I_VERSION(fhp->fh_dentry->d_inode);
cinfo->before_change = fhp->fh_pre_change;
cinfo->after_change = fhp->fh_post_change;
@@ -640,7 +642,7 @@ set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp)
cinfo->before_ctime_nsec = fhp->fh_pre_ctime.tv_nsec;
cinfo->after_ctime_sec = fhp->fh_post_attr.ctime.tv_sec;
cinfo->after_ctime_nsec = fhp->fh_post_attr.ctime.tv_nsec;
-
+#endif
}
int nfs4svc_encode_voidres(struct svc_rqst *, __be32 *, void *);
--
2.1.0
next reply other threads:[~2015-02-12 22:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-12 22:09 Bas Peters [this message]
2015-02-12 23:02 ` [PATCH] fs: nfsd:xdr4.h: add missing conditional group CONFIG_NFSD_V3 Guenter Roeck
2015-02-13 14:51 ` J. Bruce Fields
2015-02-13 16:52 ` Guenter Roeck
2015-02-13 17:33 ` J. Bruce Fields
2015-02-13 17:44 ` Guenter Roeck
2015-02-13 19:18 ` Guenter Roeck
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=1423778953-28307-1-git-send-email-baspeters93@gmail.com \
--to=baspeters93@gmail.com \
--cc=bfields@fieldses.org \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux@roeck-us.net \
/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