[Glibc-bsd-commits] r2644 - in trunk/kfreebsd-7/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-07-19 14:54:07 +0000 (Sun, 19 Jul 2009)
New Revision: 2644

Added:
   trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff
Modified:
   trunk/kfreebsd-7/debian/changelog
   trunk/kfreebsd-7/debian/patches/series
Log:
* Add 103_stat_pipe.diff: return distinct inode for distinct pipes. See #537555.



Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog	2009-07-19 11:15:15 UTC (rev 2643)
+++ trunk/kfreebsd-7/debian/changelog	2009-07-19 14:54:07 UTC (rev 2644)
@@ -1,3 +1,10 @@
+kfreebsd-7 (7.2-3) UNSTABLE; urgency=low
+
+  [ Petr Salinger ]
+  * 103_stat_pipe.diff: return distinct inode for distinct pipes. See #537555.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 12 Jun 2009 09:44:19 +0200
+
 kfreebsd-7 (7.2-2) unstable; urgency=low
 
   [ Petr Salinger ]

Added: trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff	                        (rev 0)
+++ trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff	2009-07-19 14:54:07 UTC (rev 2644)
@@ -0,0 +1,20 @@
+--- src.orig/sys/kern/sys_pipe.c
++++ src/sys/kern/sys_pipe.c
+@@ -1384,6 +1384,8 @@
+ 	struct thread *td;
+ {
+ 	struct pipe *pipe = fp->f_data;
++	unsigned long hash;
++	
+ #ifdef MAC
+ 	int error;
+ 
+@@ -1410,6 +1412,8 @@
+ 	 * Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
+ 	 * XXX (st_dev, st_ino) should be unique.
+ 	 */
++	hash = (unsigned long) (pipe->pipe_pair);
++	ub->st_ino = (((hash >> 31) ^ hash) & 0x7FFFFFFF); 
+ 	return (0);
+ }
+ 

Modified: trunk/kfreebsd-7/debian/patches/series
===================================================================
--- trunk/kfreebsd-7/debian/patches/series	2009-07-19 11:15:15 UTC (rev 2643)
+++ trunk/kfreebsd-7/debian/patches/series	2009-07-19 14:54:07 UTC (rev 2644)
@@ -14,6 +14,7 @@
 020_linker.diff 
 101_subsecond_timestamp.diff
 102_POLL_HUP.diff
+103_stat_pipe.diff
 902_version.diff
 903_disable_non-free_drivers.diff 
 904_dev_full.diff