Skip to contentSkip to conversation

utils: Fix left debug info

PATCH In review Petr Vorel 2 participants 3 messages Jan 22, 2022 – Jan 24, 2022

Subsystems (2)
lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 utils: Fix left debug info

Patch for 497ffdf8 ('manpage: remove the no longer supported value "vers2"') [1] didn't contain printf in exportfs.c (looks like debugging info) and errno handling in stropts.c (maybe work on other patch) which were applied. Thus removing it.

[1] https://lore.kernel.org/linux-nfs/[email protected]/raw

---
 utils/exportfs/exportfs.c | 2 --
 utils/mount/stropts.c     | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)
utils/exportfs/exportfs.c +0 -2
index c247425b..6ba615d1 100644
@@ -307,14 +307,12 @@ static int exportfs_generic(char *arg, char *options, int verbose)
 {
 	char *path;
 
-printf("exportfs_generic: arg '%s'\n", arg);
 	if ((path = strchr(arg, ':')) != NULL)
 		*path++ = '\0';
 
 	if (!path || *path != '/')
 		return 1;
 
-printf("exportfs_generic: path '%s'\n", path);
 	exportfs_parsed(arg, path, options, verbose);
 	return 0;
 }
utils/mount/stropts.c +1 -2
index 3ca69862..3c4e218a 100644
@@ -973,8 +973,7 @@ fall_back:
 	if ((result = nfs_try_mount_v3v2(mi, FALSE)))
 		return result;
 
-	if (errno != EBUSY)
-		errno = olderrno;
+	errno = olderrno;
 	return result;
 }
 
Signature · 1 line
2.34.1
#1 lore raw

Hey!

This patch is pretty messed up.

Quoted 4 lines · Petr Vorel

Patch for 497ffdf8 ('manpage: remove the no longer supported value "vers2"') [1] didn't contain printf in exportfs.c (looks like debugging info) and errno handling in stropts.c (maybe work on other patch) which were applied. Thus removing it.

Someone pointed it to me that with 2 v3 auto-negotiation on the same mount the is error EPROTONOSUPPORT instead of EBUSY so this test

     if (errno != EBUSY)
	errno = olderrno;

seemed to work but unfortunately I can
not find the patch/bz or thread we were
communicating in... So I am going to
remove the test until I get (or find) the
official patch

Committed!

thanks,

steved.

Quoted 42 lines

[1] https://lore.kernel.org/linux-nfs/[email protected]/raw

---
  utils/exportfs/exportfs.c | 2 --
  utils/mount/stropts.c     | 3 +--
  2 files changed, 1 insertion(+), 4 deletions(-)
utils/exportfs/exportfs.c +0 -2
index c247425b..6ba615d1 100644
@@ -307,14 +307,12 @@ static int exportfs_generic(char *arg, char *options, int verbose)
  {
  	char *path;
 
-printf("exportfs_generic: arg '%s'\n", arg);
  	if ((path = strchr(arg, ':')) != NULL)
  		*path++ = '\0';
 
  	if (!path || *path != '/')
  		return 1;
 
-printf("exportfs_generic: path '%s'\n", path);
  	exportfs_parsed(arg, path, options, verbose);
  	return 0;
  }
utils/mount/stropts.c +1 -2
index 3ca69862..3c4e218a 100644
@@ -973,8 +973,7 @@ fall_back:
  	if ((result = nfs_try_mount_v3v2(mi, FALSE)))
  		return result;
 
-	if (errno != EBUSY)
-		errno = olderrno;
+	errno = olderrno;
  	return result;
  }
 
author
#2 lore raw
Quoted 12 lines

Hey!

This patch is pretty messed up.

Quoted 4 lines · Petr Vorel

Patch for 497ffdf8 ('manpage: remove the no longer supported value "vers2"') [1] didn't contain printf in exportfs.c (looks like debugging info) and errno handling in stropts.c (maybe work on other patch) which were applied. Thus removing it.

Someone pointed it to me that with 2 v3 auto-negotiation on the same mount the is error EPROTONOSUPPORT instead of EBUSY so this test

Quoted 8 lines
     if (errno != EBUSY)
	errno = olderrno;

seemed to work but unfortunately I can
not find the patch/bz or thread we were
communicating in... So I am going to
remove the test until I get (or find) the
official patch

Hi Steve,

thanks a lot for explanation.

Also not sure if it needs to be removed, but there are at least few places which mention NFS version 2.

$ git grep -i nfs.version.2
utils/mountd/mountd.man:an NFS side protocol used by NFS version 2 [RFC1094] and NFS version 3 [RFC1813].
utils/mountd/mountd.man:can support both NFS version 2, 3 and 4. If the
utils/mountd/mountd.man:can support both NFS version 2 and the newer version 3.
utils/nfsstat/nfsstat.c:  -2                    Show NFS version 2 statistics\n\
utils/statd/sm-notify.man:For NFS version 2 and version 3, the
utils/statd/statd.man:For NFS version 2 [RFC1094] and NFS version 3 [RFC1813], the

Kind regards,
Petr

Quoted 5 lines

Committed!

thanks,

steved.