From d4d002b67115ebd418aa43bf7973a15124c332f75e6a77f825f658f6a8a0d6a3 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 2 Sep 2013 05:14:23 +0000 Subject: [PATCH] - skip-on-ENOENT.patch - suppress error message that isn't really an error (bnc#800414) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=93 --- nfs-utils.changes | 6 ++++++ nfs-utils.spec | 3 +++ skip-on-ENOENT.patch | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 skip-on-ENOENT.patch diff --git a/nfs-utils.changes b/nfs-utils.changes index d7a8836..63e483d 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 2 05:13:25 UTC 2013 - nfbrown@suse.com + +- skip-on-ENOENT.patch - suppress error message + that isn't really an error (bnc#800414) + ------------------------------------------------------------------- Mon Aug 5 15:41:31 CEST 2013 - ohering@suse.de diff --git a/nfs-utils.spec b/nfs-utils.spec index 3447a55..4bc0ef9 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -69,6 +69,8 @@ Patch4: 0004-nfsiostat-restore-output-format.patch Patch5: 0005-gssd-don-t-give-up-on-machine-credential-if-hostname.patch # PATCH-FIX-UPSTREAM 0006-gssd-fixed-typo-in-machine-cred-name.patch upstream-bugfix nfbrown@suse.de Patch6: 0006-gssd-fixed-typo-in-machine-cred-name.patch +# PATCH-FIX-UPSTREAM skip-on-ENOENT.patch nfbrown@suse.de +Patch7: skip-on-ENOENT.patch Suggests: python-base %description @@ -125,6 +127,7 @@ This package contains additional NFS documentation. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 cp %{S:6} . %build diff --git a/skip-on-ENOENT.patch b/skip-on-ENOENT.patch new file mode 100644 index 0000000..6a2deef --- /dev/null +++ b/skip-on-ENOENT.patch @@ -0,0 +1,38 @@ +From 8becedab3982d4780dbc010decc1ac7eb9ce914f Mon Sep 17 00:00:00 2001 +From: Neil Brown +Date: Mon, 2 Sep 2013 14:54:16 +1000 +Subject: [PATCH] gssd: support error message if rpc_pipefs dir disappears. + +It is possible for a race to cause a name to appear when an rpc_pipefs +dir is scanned but to no longer be present when we try to open it. + +So if the error is ENOENT, don't complain. + +This is similar to + +commit 5ac9bcfd820f09af4d3f87f1f7346d896f70bc9a +Author: David Jeffery +Date: Wed Jan 16 15:21:55 2013 -0500 + + rpc.idmapd: Ignore open failures in dirscancb() + +which addressed a similar issue in idmapd. + +Signed-off-by: NeilBrown + +diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c +index b7e2bbb..2d3dbec 100644 +--- a/utils/gssd/gssd_proc.c ++++ b/utils/gssd/gssd_proc.c +@@ -467,8 +467,9 @@ process_clnt_dir(char *dir, char *pdir) + } + sprintf(clp->dirname, "%s/%s", pdir, dir); + if ((clp->dir_fd = open(clp->dirname, O_RDONLY)) == -1) { +- printerr(0, "ERROR: can't open %s: %s\n", +- clp->dirname, strerror(errno)); ++ if (errno != ENOENT) ++ printerr(0, "ERROR: can't open %s: %s\n", ++ clp->dirname, strerror(errno)); + goto fail_destroy_client; + } + fcntl(clp->dir_fd, F_SETSIG, DNOTIFY_SIGNAL);