Skip to contentSkip to conversation

fs: nfsd:xdr4.h: add missing conditional group CONFIG_NFSD_V3

PATCH In review Bas Peters 3 participants 7 messages Feb 12, 2015 – Feb 13, 2015

Subsystems (3)
lore
Share & tools
lore

Bas Peters

author
#0 lore raw

PATCH 1/1 fs: nfsd:xdr4.h: add missing conditional group CONFIG_NFSD_V3

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.

---
 fs/nfsd/xdr4.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/nfsd/xdr4.h +4 -2
index 0bda93e..5d1597f 100644
@@ -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 *);
Signature · 1 line
2.1.0
#1 lore raw
Quoted 29 lines · Bas Peters

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.

---
 fs/nfsd/xdr4.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/nfsd/xdr4.h +3 -1
index 0bda93e..5d1597f 100644
@@ -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;

fs/nfsd/xdr4.h set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp) · line 646

Quoted 6 lines
fs/nfsd/xdr4.h +1 -1
@@ -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
 }

You'll want to include and example of the build failure in the description, bisect results after the '---' line, and a Fixes: line pointing to the patch breaking the build.

In this case, I am not sure if the above really fixes the problem, or if it just hides it behind an #ifdef. To determine that, it will probably be necessary to know which patch actually caused the problem. This even more true since the code in question was not changed since around 2010, so making it conditional looks really suspicious.

In the curent case, I suspect that the problem may have been introduced by commit 9cf514ccfac ("nfsd: implement pNFS operations"). That is just a guess, though; I didn't run bisect myself. The key really is to figure out why the code now fails to build, and not just to comment out the code that is causing the failure.

Thanks,
Guenter
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
Quoted 47 lines · Guenter Roeck
Quoted 29 lines · Bas Peters

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.

---
 fs/nfsd/xdr4.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/nfsd/xdr4.h +3 -1
index 0bda93e..5d1597f 100644
@@ -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;

fs/nfsd/xdr4.h set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp) · line 646

Quoted 6 lines
fs/nfsd/xdr4.h +1 -1
@@ -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
 }

You'll want to include and example of the build failure in the description, bisect results after the '---' line, and a Fixes: line pointing to the patch breaking the build.

In this case, I am not sure if the above really fixes the problem, or if it just hides it behind an #ifdef. To determine that, it will probably be necessary to know which patch actually caused the problem. This even more true since the code in question was not changed since around 2010, so making it conditional looks really suspicious.

Quoted 5 lines

In the curent case, I suspect that the problem may have been introduced by commit 9cf514ccfac ("nfsd: implement pNFS operations"). That is just a guess, though; I didn't run bisect myself. The key really is to figure out why the code now fails to build, and not just to comment out the code that is causing the failure.

Yeah, when Jim Davis reported this I took a quick look at the history, didn't see an obvious explanation, and figured well maybe this is just the first time anyone's hit that particular config in a while. Sounds like this actually is a recent regression?

--b.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 54 lines · J. Bruce Fields
Quoted 47 lines · Guenter Roeck
Quoted 29 lines · Bas Peters

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.

---
  fs/nfsd/xdr4.h | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
fs/nfsd/xdr4.h +3 -1
index 0bda93e..5d1597f 100644
@@ -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;

fs/nfsd/xdr4.h set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp) · line 646

Quoted 6 lines
fs/nfsd/xdr4.h +1 -1
@@ -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
  }

You'll want to include and example of the build failure in the description, bisect results after the '---' line, and a Fixes: line pointing to the patch breaking the build.

In this case, I am not sure if the above really fixes the problem, or if it just hides it behind an #ifdef. To determine that, it will probably be necessary to know which patch actually caused the problem. This even more true since the code in question was not changed since around 2010, so making it conditional looks really suspicious.

Quoted 5 lines

In the curent case, I suspect that the problem may have been introduced by commit 9cf514ccfac ("nfsd: implement pNFS operations"). That is just a guess, though; I didn't run bisect myself. The key really is to figure out why the code now fails to build, and not just to comment out the code that is causing the failure.

Quoted 5 lines

Yeah, when Jim Davis reported this I took a quick look at the history, didn't see an obvious explanation, and figured well maybe this is just the first time anyone's hit that particular config in a while. Sounds like this actually is a recent regression?

It was intruduced by 9cf514ccfac. Problem is that xdr4.h is only supposed to be used and included by NFSv4 code but is now included even if NFSv3 and/or NFSv4 are not configured. The variables in fhp accessed above do not exist unless NFSv3 is configured.

The patch here is therefore really just a kludge, though I don't really know an easy real fix.

If you ask me, I'd say that 9cf514ccfac was rushed into mainline a bit. It showed up in next on Feb 10 and pushed into mainline just a day or two later. Result is that every build with NFS configured but not NSFv3 is now broken.

Guenter

#4 lore raw
Quoted 66 lines · Guenter Roeck
Quoted 54 lines · J. Bruce Fields
Quoted 47 lines · Guenter Roeck
Quoted 29 lines · Bas Peters

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.

---
 fs/nfsd/xdr4.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
fs/nfsd/xdr4.h +3 -1
index 0bda93e..5d1597f 100644
@@ -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;

fs/nfsd/xdr4.h set_change_info(struct nfsd4_change_info *cinfo, struct svc_fh *fhp) · line 646

Quoted 6 lines
fs/nfsd/xdr4.h +1 -1
@@ -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
 }

You'll want to include and example of the build failure in the description, bisect results after the '---' line, and a Fixes: line pointing to the patch breaking the build.

In this case, I am not sure if the above really fixes the problem, or if it just hides it behind an #ifdef. To determine that, it will probably be necessary to know which patch actually caused the problem. This even more true since the code in question was not changed since around 2010, so making it conditional looks really suspicious.

Quoted 5 lines

In the curent case, I suspect that the problem may have been introduced by commit 9cf514ccfac ("nfsd: implement pNFS operations"). That is just a guess, though; I didn't run bisect myself. The key really is to figure out why the code now fails to build, and not just to comment out the code that is causing the failure.

Quoted 5 lines

Yeah, when Jim Davis reported this I took a quick look at the history, didn't see an obvious explanation, and figured well maybe this is just the first time anyone's hit that particular config in a while. Sounds like this actually is a recent regression?

It was intruduced by 9cf514ccfac. Problem is that xdr4.h is only supposed to be used and included by NFSv4 code but is now included even if NFSv3 and/or NFSv4 are not configured. The variables in fhp accessed above do not exist unless NFSv3 is configured.

Quoted 6 lines

The patch here is therefore really just a kludge, though I don't really know an easy real fix.

If you ask me, I'd say that 9cf514ccfac was rushed into mainline a bit. It showed up in next on Feb 10 and pushed into mainline just a day or two later.

Blame me for that decision.

Quoted 2 lines

Result is that every build with NFS configured but not NSFv3 is now broken.

Fortunately a v2-only server would be pretty unusual these days.

I don't know, maybe this?

--b.

commit 535c381153631af3bc708a97e267a2a6a86ee030

Author: J. Bruce Fields <[email protected]>
Date:   Fri Feb 13 12:27:39 2015 -0500

nfsd4: fix v3-less build

Includes of pnfs.h in export.c and fcntl.c also bring in xdr4.h, which won't build without CONFIG_NFSD_V3, breaking non-V3 builds. Ifdef-out most of pnfs.h in that case.

Fixes 9cf514ccfac "nfsd: implement pNFS operations"
fs/nfsd/pnfs.h +5 -0
index fedb4d6..d4c4453 100644
@@ -1,6 +1,7 @@
 #ifndef _FS_NFSD_PNFS_H
 #define _FS_NFSD_PNFS_H 1
 
+#ifdef CONFIG_NFSD_V4
 #include <linux/exportfs.h>
 #include <linux/nfsd/export.h>
 
@@ -50,6 +51,7 @@ __be32 nfsd4_return_client_layouts(struct svc_rqst *rqstp,
 int nfsd4_set_deviceid(struct nfsd4_deviceid *id, const struct svc_fh *fhp,
 		u32 device_generation);
 struct nfsd4_deviceid_map *nfsd4_find_devid_map(int idx);
+#endif /* CONFIG_NFSD_V4 */
 
 #ifdef CONFIG_NFSD_PNFS
 void nfsd4_setup_layout_type(struct svc_export *exp);
@@ -59,6 +61,9 @@ void nfsd4_return_all_file_layouts(struct nfs4_client *clp,
 int nfsd4_init_pnfs(void);
 void nfsd4_exit_pnfs(void);
 #else
+struct nfs4_client;
+struct nfs4_file;
+
 static inline void nfsd4_setup_layout_type(struct svc_export *exp)
 {
 }
#5 lore raw
Quoted 7 lines · J. Bruce Fields
Quoted 2 lines

Result is that every build with NFS configured but not NSFv3 is now broken.

Fortunately a v2-only server would be pretty unusual these days.

I don't know, maybe this?

I applied the patch below on top of current mainline and passed it to my build farm. I'll let you know how it goes.

Guenter

Quoted 48 lines

--b.

commit 535c381153631af3bc708a97e267a2a6a86ee030

Author: J. Bruce Fields <[email protected]>
Date:   Fri Feb 13 12:27:39 2015 -0500

nfsd4: fix v3-less build

Includes of pnfs.h in export.c and fcntl.c also bring in xdr4.h, which won't build without CONFIG_NFSD_V3, breaking non-V3 builds. Ifdef-out most of pnfs.h in that case.

Fixes 9cf514ccfac "nfsd: implement pNFS operations"
fs/nfsd/pnfs.h +5 -0
index fedb4d6..d4c4453 100644
@@ -1,6 +1,7 @@
  #ifndef _FS_NFSD_PNFS_H
  #define _FS_NFSD_PNFS_H 1
 
+#ifdef CONFIG_NFSD_V4
  #include <linux/exportfs.h>
  #include <linux/nfsd/export.h>
 
@@ -50,6 +51,7 @@ __be32 nfsd4_return_client_layouts(struct svc_rqst *rqstp,
  int nfsd4_set_deviceid(struct nfsd4_deviceid *id, const struct svc_fh *fhp,
  		u32 device_generation);
  struct nfsd4_deviceid_map *nfsd4_find_devid_map(int idx);
+#endif /* CONFIG_NFSD_V4 */
 
  #ifdef CONFIG_NFSD_PNFS
  void nfsd4_setup_layout_type(struct svc_export *exp);
@@ -59,6 +61,9 @@ void nfsd4_return_all_file_layouts(struct nfs4_client *clp,
  int nfsd4_init_pnfs(void);
  void nfsd4_exit_pnfs(void);
  #else
+struct nfs4_client;
+struct nfs4_file;
+
  static inline void nfsd4_setup_layout_type(struct svc_export *exp)
  {
  }
Tested-by
#6 lore raw
In reply to J. Bruce Fields

On 02/13/2015 09:33 AM, J. Bruce Fields wrote:
[...]

Quoted 16 lines
Quoted 3 lines

Result is that every build with NFS configured but not NSFv3 is now broken.

Fortunately a v2-only server would be pretty unusual these days.

I don't know, maybe this?

--b.

commit 535c381153631af3bc708a97e267a2a6a86ee030

Author: J. Bruce Fields <[email protected]>
Date:   Fri Feb 13 12:27:39 2015 -0500

nfsd4: fix v3-less build

Quoted 8 lines

Includes of pnfs.h in export.c and fcntl.c also bring in xdr4.h, which won't build without CONFIG_NFSD_V3, breaking non-V3 builds. Ifdef-out most of pnfs.h in that case.

Fixes 9cf514ccfac "nfsd: implement pNFS operations"

Passes all my build and runtime tests.

Guenter