[nfs-utils] Fixed a I/0 problem in rpc.idmapd (bz 684308)

[Steve Dickson]

commit 855dc13683b12c6c33899fedd88a5891c1ea4315
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Oct 4 13:41:08 2011 -0400

    Fixed a I/0 problem in rpc.idmapd (bz 684308)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-utils-1.2.5-idmapd-ioerror.patch |   30 ++++++++++++++++++++++++++++++
 nfs-utils.spec                       |    3 +++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/nfs-utils-1.2.5-idmapd-ioerror.patch b/nfs-utils-1.2.5-idmapd-ioerror.patch
new file mode 100644
index 0000000..703a260
--- /dev/null
+++ b/nfs-utils-1.2.5-idmapd-ioerror.patch
@@ -0,0 +1,30 @@
+commit 8f065a26d49eabebc3995b8f6966b15ef7553b3e
+Author: Luca Giuzzi <luca.giuzzi at gmail.com>
+Date:   Tue Oct 4 13:35:06 2011 -0400
+
+    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 <jlayton at redhat.com>
+    Signed-off-by: Steve Dickson <steved at redhat.com>
+
+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);
+ 	}
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 6561b67..5210eb3 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -31,6 +31,7 @@ Source52: nfs-server.postconfig
 Patch001: nfs-utils-1.2.6-rc1.patch
 Patch002: nfs-utils-1.2.4-mountshortcut.patch
 Patch003: nfs-utils-1.2.5-manpage-typos.patch
+Patch004: nfs-utils-1.2.5-idmapd-ioerror.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -89,6 +90,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch001 -p1
 %patch002 -p1
 %patch003 -p1
+%patch004 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -279,6 +281,7 @@ fi
 * Tue Oct  4 2011 Steve Dickson <steved at redhat.com> 1.2.5-2
 - Removed SUID bigs on mount commands (bz 528498)
 - Fixed a few typos in a couple man pages (bz 668124, 673818, 664330)
+- Fixed a I/0 problem in rpc.idmapd (bz 684308)
 
 * Mon Oct  3 2011 Steve Dickson <steved at redhat.com> 1.2.5-1
 - Update to upstream RC release: nfs-utils-1.2.6-rc1