rpms/lsof/devel lsof_4.74-rh-nfs.patch, NONE, 1.1 lsof.spec, 1.18, 1.19

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/lsof/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10347

Modified Files:
	lsof.spec 
Added Files:
	lsof_4.74-rh-nfs.patch 
Log Message:
- fix "lsof -b" hangs if a process is stuck in disk-wait/NFS (#131712)

lsof_4.74-rh-nfs.patch:
 dmnt.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

--- NEW FILE lsof_4.74-rh-nfs.patch ---
--- lsof_4.74-rh/dialects/linux/dmnt.c.nfshangup	2005-03-23 12:08:49.038665464 +0100
+++ lsof_4.74-rh/dialects/linux/dmnt.c	2005-03-23 12:14:20.573264544 +0100
@@ -441,6 +441,12 @@
 	    ||  !fp[0] || !fp[1] || !fp[2])
 		continue;
 	/*
+	 * Detect NFS as soon as possible
+	 */
+	if (strcasecmp(fp[2], "nfs") == 0)
+	    HasNFS = 1;
+
+	/*
 	 * Convert octal-escaped characters in the device name and mounted-on
 	 * path name.
 	 */
@@ -530,11 +536,7 @@
 	    mp->rdev = (ds & SB_RDEV) ? sb.st_rdev : 0;
 	    mp->inode = (ds & SB_INO) ? sb.st_ino : 0;
 	    mp->mode = (ds & SB_MODE) ? sb.st_mode : 0;
-	    if (strcasecmp(fp[2], "nfs") == 0) {
-		HasNFS = 1;
-		mp->ty = N_NFS;
-	    } else
-		mp->ty = N_REGLR;
+	    mp->ty = strcasecmp(fp[2], "nfs") == 0 ? N_NFS : N_REGLR;
 
 #if	defined(HASMNTSUP)
 	/*


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lsof.spec	14 Mar 2005 10:38:27 -0000	1.18
+++ lsof.spec	23 Mar 2005 11:31:34 -0000	1.19
@@ -1,11 +1,12 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.74
-Release: 5
+Release: 6
 License: Free
 %define lsofrh lsof_%{version}-rh
 Group: Development/Debuggers
 Source0: %{lsofrh}.tar.bz2
+Patch1: lsof_4.74-rh-nfs.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -16,6 +17,7 @@
 
 %prep
 %setup -q -n %{lsofrh}
+%patch1 -p1 -b .nfs
 
 
 %build
@@ -43,6 +45,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Mar 23 2005 Karel Zak <kzak at redhat.com> 4.74-6
+- fix "lsof -b" hangs if a process is stuck in disk-wait/NFS (#131712)
+
 * Mon Mar 14 2005 Karel Zak <kzak at redhat.com> 4.74-5
 - src.rpm cleanup