commit nfs-utils for openSUSE:12.1:Update:Test

Hello community, here is the log from the commit of package nfs-utils for openSUSE:12.1:Update:Test checked in at 2012-01-03 17:44:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/nfs-utils (Old) and /work/SRC/openSUSE:12.1:Update:Test/.nfs-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nfs-utils", Maintainer is "NFBrown@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/nfs-utils/nfs-utils.changes 2012-01-03 17:44:21.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.nfs-utils.new/nfs-utils.changes 2012-01-03 17:44:23.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Jan 3 04:19:14 UTC 2012 - nfbrown@suse.com + +- conffile.patch - fix parsing of idmapd.conf + (bnc#732354) +- bg-mount-timeout.patch - fix use of 'bg' option +- IO-possible.patch - Fix bug that causes rpc.idmpa.d to die +- mount-err.patch - fix interpretion of different error + codes when mounting + +------------------------------------------------------------------- New: ---- IO-possible.patch bg-mount-timeout.patch conffile.patch mount-err.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.1ST1eU/_old 2012-01-03 17:44:23.000000000 +0100 +++ /var/tmp/diff_new_pack.1ST1eU/_new 2012-01-03 17:44:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nfs-utils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,6 +55,10 @@ Patch0: nfs-utils-1.0.7-bind-syntax.patch Patch1: warn-nfs-udp.patch Patch2: nfs-utils-page_size.patch +Patch3: conffile.patch +Patch4: bg-mount-timeout.patch +Patch5: IO-possible.patch +Patch6: mount-err.patch Suggests: python-base %description @@ -135,6 +139,10 @@ %patch0 -p1 %patch1 -p1 %patch2 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 cp %{S:6} . %build ++++++ IO-possible.patch ++++++

From 8f065a26d49eabebc3995b8f6966b15ef7553b3e Mon Sep 17 00:00:00 2001 From: Luca Giuzzi Date: Tue, 4 Oct 2011 13:35:06 -0400 Subject: [PATCH] rpc.idmapd: Dies with 'I/O possible'

We have had problems on some of our machines (all Fedora 14), where rpc.idmapd used to die with an `I/O possible' message at (basically) random times. A strace suggested the issue being in nfsopen() where a signal type is reset before notification is disabled; a signal at just the right time might be the cause of the problem; see https://bugzilla.redhat.com/show_bug.cgi?id=684308 Reviewed-by: Jeff Layton Signed-off-by: Steve Dickson diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c index 19d9114..e80efb4 100644 --- a/utils/idmapd/idmapd.c +++ b/utils/idmapd/idmapd.c @@ -778,8 +778,8 @@ nfsopen(struct idmap_client *ic) } else { event_set(&ic->ic_event, ic->ic_fd, EV_READ, nfscb, ic); event_add(&ic->ic_event, NULL); - fcntl(ic->ic_dirfd, F_SETSIG, 0); fcntl(ic->ic_dirfd, F_NOTIFY, 0); + fcntl(ic->ic_dirfd, F_SETSIG, 0); if (verbose > 0) xlog_warn("Opened %s", ic->ic_path); } ++++++ bg-mount-timeout.patch ++++++

From 6fbbb73f08a8f685a323b2d5221f3e8b87ebba68 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Mon, 5 Dec 2011 09:48:46 -0500 Subject: [PATCH] mount.nfs: Background mounts failing on time out errors.

Mounting with the "-o v3,bg,proto=udp" options will fail, instead of retrying, when the server is down. The reason being nfs_rewrite_pmap_mount_options() does not interrupt RPC timeouts correctly. Signed-off-by: Steve Dickson diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 4032bf3..d52e21a 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -540,6 +540,8 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options) errno = EOPNOTSUPP; else if (rpc_createerr.cf_stat == RPC_AUTHERROR) errno = EACCES; + else if (rpc_createerr.cf_stat == RPC_TIMEDOUT) + errno = ETIMEDOUT; else if (rpc_createerr.cf_error.re_errno != 0) errno = rpc_createerr.cf_error.re_errno; return 0; ++++++ conffile.patch ++++++

From d22ef3f525d71b565fcc688557273a6cabeeb71a Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Mon, 14 Nov 2011 09:54:47 -0500 Subject: [PATCH] rpc.idmapd: Sections in idmapd.conf are ignored.

In the parsing routine, conf_parse_line(), a string is not being null terminated which is causing section of the config file to be ignored. https://bugzilla.linux-nfs.org/show_bug.cgi?id=205 Signed-off-by: Steve Dickson diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c index fa0dc6b..3990578 100644 --- a/support/nfs/conffile.c +++ b/support/nfs/conffile.c @@ -256,13 +256,14 @@ conf_parse_line(int trans, char *line, size_t sz) val++, j++; if (*val) i = j; - section = malloc(i); + section = malloc(i+1); if (!section) { xlog_warn("conf_parse_line: %d: malloc (%lu) failed", ln, (unsigned long)i); return; } strncpy(section, line, i); + section[i] = '\0'; if (arg) free(arg); ++++++ mount-err.patch ++++++

From 9da66f8898a69b77121a4f2ae785e9cd29e94e6c Mon Sep 17 00:00:00 2001 From: Yang Bai Date: Tue, 18 Oct 2011 11:53:11 -0400 Subject: [PATCH] mount.nfs: Mount should really return from errno test

We should only try next address family if we meet ECONNREFUSED or EHOSTUNREACH for v4 or ECONNREFUSED or EOPNOTSUPP or EHOSTUNREACH for v3v2. Before, only a break in swich can not make the program out of for loop. Signed-off-by: Yang Bai Signed-off-by: Steve Dickson diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 314a806..4032bf3 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -665,9 +665,10 @@ static int nfs_try_mount_v3v2(struct nfsmount_info *mi) case EHOSTUNREACH: continue; default: - break; + goto out; } } +out: return ret; } @@ -751,9 +752,10 @@ static int nfs_try_mount_v4(struct nfsmount_info *mi) case EHOSTUNREACH: continue; default: - break; + goto out; } } +out: return ret; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org