2020-10-29 21:29:36

by Holger Hoffstätte

Subject: [PATCH] nfs-utils: remove leftover debugging messages

After updating to nfs-utils-2.5.2 I noticed extra output on the console
when exporting mounts. Apparently commit 482e72ba04 forgot to remove some
debugging messages and accidentally committed them.

Signed-off-by: Holger Hoffstätte <[email protected]>
---
support/misc/nfsd_path.c | 2 +-
utils/exportfs/exportfs.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/support/misc/nfsd_path.c b/support/misc/nfsd_path.c
index 8efbfcd3..65e53c13 100644
--- a/support/misc/nfsd_path.c
+++ b/support/misc/nfsd_path.c
@@ -110,7 +110,7 @@ nfsd_setup_workqueue(void)

if (!rootdir)
return;
-printf("rootdir %s\n", rootdir);
+
nfsd_wq = xthread_workqueue_alloc();
if (!nfsd_wq)
return;
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 9d5e575b..cde5e517 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -176,10 +176,8 @@ main(int argc, char **argv)
xlog(L_ERROR, "-r and -u are incompatible");
return 1;
}
-printf("point 1\n");
if (!setup_state_path_names(progname, ETAB, ETABTMP, ETABLCK, &etab))
return 1;
-printf("point 2\n");
if (optind == argc && ! f_all) {
if (force_flush) {
cache_flush(1);
@@ -193,7 +191,6 @@ printf("point 2\n");
return 0;
}
}
-printf("point 3\n");

/*
* Serialize things as best we can
--
2.29.1

2020-10-31 16:26:52

by Steve Dickson

Subject: Re: [PATCH] nfs-utils: remove leftover debugging messages

On 10/29/20 5:18 PM, Holger Hoffstätte wrote:
>
> After updating to nfs-utils-2.5.2 I noticed extra output on the console
> when exporting mounts. Apparently commit 482e72ba04 forgot to remove some
> debugging messages and accidentally committed them.
>
> Signed-off-by: Holger Hoffstätte <[email protected]>
WOW! I did skip a beat on this one! Thanks for the clean up!!!

Committed!

steved.
> ---
>  support/misc/nfsd_path.c  | 2 +-
>  utils/exportfs/exportfs.c | 3 ---
>  2 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/support/misc/nfsd_path.c b/support/misc/nfsd_path.c
> index 8efbfcd3..65e53c13 100644
> --- a/support/misc/nfsd_path.c
> +++ b/support/misc/nfsd_path.c
> @@ -110,7 +110,7 @@ nfsd_setup_workqueue(void)
>  
>      if (!rootdir)
>          return;
> -printf("rootdir %s\n", rootdir);
> +
>      nfsd_wq = xthread_workqueue_alloc();
>      if (!nfsd_wq)
>          return;
> diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
> index 9d5e575b..cde5e517 100644
> --- a/utils/exportfs/exportfs.c
> +++ b/utils/exportfs/exportfs.c
> @@ -176,10 +176,8 @@ main(int argc, char **argv)
>          xlog(L_ERROR, "-r and -u are incompatible");
>          return 1;
>      }
> -printf("point 1\n");
>      if (!setup_state_path_names(progname, ETAB, ETABTMP, ETABLCK, &etab))
>          return 1;
> -printf("point 2\n");
>      if (optind == argc && ! f_all) {
>          if (force_flush) {
>              cache_flush(1);
> @@ -193,7 +191,6 @@ printf("point 2\n");
>              return 0;
>          }
>      }
> -printf("point 3\n");
>  
>      /*
>       * Serialize things as best we can