r721 - x86/trunk/packages/unionfs

justin at linuxfromscratch.org justin at linuxfromscratch.org
Thu Sep 22 23:38:31 PDT 2005


Author: justin
Date: 2005-09-23 00:38:30 -0600 (Fri, 23 Sep 2005)
New Revision: 721

Added:
   x86/trunk/packages/unionfs/unionfs-1.0.14-fixes-1.patch
Modified:
   x86/trunk/packages/unionfs/Makefile
Log:
Added patch to correct off-by-one error in unionfs, added to Makefile.

Modified: x86/trunk/packages/unionfs/Makefile
===================================================================
--- x86/trunk/packages/unionfs/Makefile	2005-09-23 06:25:08 UTC (rev 720)
+++ x86/trunk/packages/unionfs/Makefile	2005-09-23 06:38:30 UTC (rev 721)
@@ -10,6 +10,7 @@
 SHA-$(FILE)= 70b87ec8ae1b5b51b2d7a7b9ef4da80565ee124e
 
 PATCH1= $(DIR)-fix_builtin-1.patch
+PATCH2= $(DIR)-fixes-1.patch
 
 # Targets
 # =============================================================================
@@ -28,6 +29,7 @@
 #==============================================================================
 # Make commands below \/
 #==============================================================================
+	@patch -Np1 -i ../$(PATCH2)
 	@make KVERS=$(KVERS) PREFIX=/usr EXTRACFLAGS=-DNODEBUG \
 	 >>../$(DIR)-$@.log 2>&1
 #

Added: x86/trunk/packages/unionfs/unionfs-1.0.14-fixes-1.patch
===================================================================
--- x86/trunk/packages/unionfs/unionfs-1.0.14-fixes-1.patch	2005-09-23 06:25:08 UTC (rev 720)
+++ x86/trunk/packages/unionfs/unionfs-1.0.14-fixes-1.patch	2005-09-23 06:38:30 UTC (rev 721)
@@ -0,0 +1,20 @@
+Submitted by: Justin Knierim (justin at linuxfromscratch dot org)
+Date: 2005-09-22
+Initial Package Version: 1.0.14
+Origin: Junjiro Okajima
+Upstream Status: Submitted
+Description: Fixes a off by one error in unionfs which causes
+             instability when a file is overwritten multiple times.
+
+diff -Naur unionfs-orig/inode.c unionfs-1.0.14/inode.c
+--- unionfs-orig/inode.c	2005-09-15 14:55:43.000000000 -0400
++++ unionfs-1.0.14/inode.c	2005-09-22 21:38:14.000000000 -0400
+@@ -45,7 +45,7 @@
+ 	hidden_dentry = dtohd(dentry);
+ 
+ 	/* check if whiteout exists in this branch, i.e. lookup .wh.foo first */
+-	name = KMALLOC(dentry->d_name.len + sizeof(".wh"), GFP_UNIONFS);
++	name = KMALLOC(dentry->d_name.len + sizeof(".wh."), GFP_UNIONFS);
+ 	if (!name) {
+ 		err = -ENOMEM;
+ 		goto out;




More information about the livecd mailing list