rpms/lsof/devel lsof_4.72-rh-eventpoll.patch, NONE, 1.1 lsof.spec, 1.24, 1.25

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Feb 15 16:03:31 UTC 2006


Author: kzak

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

Modified Files:
	lsof.spec 
Added Files:
	lsof_4.72-rh-eventpoll.patch 
Log Message:
add eventpoll hack

lsof_4.72-rh-eventpoll.patch:
 dnode.c |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

--- NEW FILE lsof_4.72-rh-eventpoll.patch ---
--- lsof_4.72-rh/dialects/linux/dnode.c.eventpoll	2006-02-15 16:22:33.000000000 +0100
+++ lsof_4.72-rh/dialects/linux/dnode.c	2006-02-15 16:22:13.000000000 +0100
@@ -449,13 +449,22 @@
 		tn = "LINK";
 		break;
 	    default:
-		if (type > 9999)
-		    (void) snpf(Lf->type, sizeof(Lf->type), "*%03d",
-				type % 1000);
-		else
-		    (void) snpf(Lf->type, sizeof(Lf->type), "%04d", type);
-		(void) snpf(Namech, Namechl, "unknown inode type");
-		tn = (char *)NULL;
+		/* eventpoll hack */
+		if (p && strncmp(p, "eventpoll", 9)==0)
+		{
+			tn = "epoll";
+			(void) snpf(Namech, Namechl, "%s", "eventpoll");
+		}
+		else 
+		{
+			if (type > 9999)
+		    		(void) snpf(Lf->type, sizeof(Lf->type), "*%03d",
+					type % 1000);
+			else
+			    (void) snpf(Lf->type, sizeof(Lf->type), "%04d", type);
+			(void) snpf(Namech, Namechl, "unknown inode type");
+			tn = (char *)NULL;
+		}
 	    }
 	} else
 	    tn = "unknown";


Index: lsof.spec
===================================================================
RCS file: /cvs/dist/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- lsof.spec	11 Feb 2006 04:25:43 -0000	1.24
+++ lsof.spec	15 Feb 2006 16:03:01 -0000	1.25
@@ -1,11 +1,12 @@
 Summary: A utility which lists open files on a Linux/UNIX system.
 Name: lsof
 Version: 4.76
-Release: 1.2.1
+Release: 2
 License: Free
 %define lsofrh lsof_%{version}-rh
 Group: Development/Debuggers
 Source0: %{lsofrh}.tar.bz2
+Patch1: lsof_4.72-rh-eventpoll.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -16,7 +17,7 @@
 
 %prep
 %setup -q -n %{lsofrh}
-
+%patch1 -p1 -b .eventpoll
 
 %build
 #LINUX_KERNEL=`pwd`/../linux LSOF_INCLUDE=`pwd`/../linux/include \
@@ -43,6 +44,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Wed Feb 15 2006 Karel Zak <kzak at redhat.com> 4.76-2
+- fix #175568 - lsof prints 'unknown inode type' for epoll
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 4.76-1.2.1
 - bump again for double-long bug on ppc(64)
 




More information about the fedora-cvs-commits mailing list