rpm/nfs-utils
SHA256
1
0
Fork 0
forked from pool/nfs-utils
Code Pull Requests Activity

Accepting request 197461 from Base:System

Browse Source 
- nfs.init: always start gssd.
  Recent kernel change means that if gssd isn't running
  and NFSv4 mount will wait 15 seconds before timing out
  even if gss security wasn't requested.
  So just start gssd alway - there is no significant cost
  in this.
  (bnc#837262)

- skip-on-ENOENT.patch - suppress error message
  that isn't really an error (bnc#800414)

OBS-URL: https://build.opensuse.org/request/show/197461
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=105
This commit is contained in:
Stephan Kulow 2013-09-05 21:21:41 +00:00 committed by Git OBS Bridge
commit 77848b611f
4 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nfs-utils.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Sep 5 05:05:13 UTC 2013 - nfbrown@suse.com
- nfs.init: always start gssd.
Recent kernel change means that if gssd isn't running
and NFSv4 mount will wait 15 seconds before timing out
even if gss security wasn't requested.
So just start gssd alway - there is no significant cost
in this.
(bnc#837262)
-------------------------------------------------------------------
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

3
nfs-utils.spec
View File

@ -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

3
nfs.init
View File

@ -37,7 +37,8 @@ if [ -z "$RPC_PIPEFS_DIR" ]; then
fi
NEED_IDMAPD=no
NEED_GSSD=no
#always start gssd, else kernel waits for it.
NEED_GSSD=yes
NEED_LDCONFIG=no
state=0
usr=""

38
skip-on-ENOENT.patch Normal file
View File

@ -0,0 +1,38 @@
From 8becedab3982d4780dbc010decc1ac7eb9ce914f Mon Sep 17 00:00:00 2001
From: Neil Brown <neilb@suse.de>
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 <djeffery@redhat.com>
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 <neilb@suse.de>
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);