Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Petr Vorel <pvorel@suse.cz>
To:     linux-nfs@vger.kernel.org
Cc:     Petr Vorel <pvorel@suse.cz>, Steve Dickson <steved@redhat.com>,
        Yongcheng Yang <yongcheng.yang@gmail.com>
Subject: [PATCH 1/1] utils: Fix left debug info
Date:   Sat, 22 Jan 2022 19:02:43 +0100
Message-Id: <20220122180243.19355-1-pvorel@suse.cz>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

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/20220117031356.13361-1-yoyang@redhat.com/raw

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 utils/exportfs/exportfs.c | 2 --
 utils/mount/stropts.c     | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index c247425b..6ba615d1 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -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;
 }
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 3ca69862..3c4e218a 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -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;
 }
 
-- 
2.34.1