SOURCES (LINUX_2_6): kernel-unionfs-vserver.patch - updated for un...

[zbyniu]

Author: zbyniu                       Date: Tue Oct  9 14:39:36 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated for unionfs-2.1.6_for_2.6.23-rc8.diff

---- Files affected:
SOURCES:
   kernel-unionfs-vserver.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-unionfs-vserver.patch
diff -u SOURCES/kernel-unionfs-vserver.patch:1.1.2.1 SOURCES/kernel-unionfs-vserver.patch:1.1.2.2
--- SOURCES/kernel-unionfs-vserver.patch:1.1.2.1	Thu Sep 20 19:43:15 2007
+++ SOURCES/kernel-unionfs-vserver.patch	Tue Oct  9 16:39:30 2007
@@ -37,15 +37,6 @@
 diff -urp a/fs/unionfs/inode.c b/fs/unionfs/inode.c
 --- a/fs/unionfs/inode.c	2007-09-20 16:19:41.996647500 +0200
 +++ b/fs/unionfs/inode.c	2007-09-20 16:25:09.241099000 +0200
-@@ -85,7 +85,7 @@ static int unionfs_create(struct inode *
- 			struct dentry *lower_dir_dentry;
- 
- 			lower_dir_dentry = lock_parent(wh_dentry);
--			err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
-+			err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry, NULL);
- 			unlock_dir(lower_dir_dentry);
- 
- 			if (err) {
 @@ -329,7 +329,7 @@ static int unionfs_link(struct dentry *o
  		err = is_robranch_super(new_dentry->d_sb, dbstart(new_dentry));
  		if (!err)
@@ -83,11 +74,11 @@
  
  		fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
 @@ -536,7 +536,7 @@ static int unionfs_symlink(struct inode 
+ 		if (!err) {
  			mode = S_IALLUGO;
- 			err =
- 				vfs_symlink(lower_dir_dentry->d_inode,
--					    lower_dentry, symname, mode);
-+					    lower_dentry, symname, mode, NULL);
+ 			err = vfs_symlink(lower_dir_dentry->d_inode,
+-					  lower_dentry, symname, mode);
++					  lower_dentry, symname, mode, NULL);
  		}
  		unlock_dir(lower_dir_dentry);
  
@@ -182,18 +173,18 @@
 --- a/fs/unionfs/unlink.c	2007-09-20 16:19:42.004648000 +0200
 +++ b/fs/unionfs/unlink.c	2007-09-20 16:25:09.253099750 +0200
 @@ -40,7 +40,7 @@ static int unionfs_unlink_whiteout(struc
- 	/* avoid destroying the lower inode if the file is in use */
  	dget(lower_dentry);
- 	if (!(err = is_robranch_super(dentry->d_sb, bindex)))
+ 	err = is_robranch_super(dentry->d_sb, bindex);
+ 	if (!err)
 -		err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
 +		err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry, NULL);
  	/* if vfs_unlink succeeded, update our inode's times */
  	if (!err)
  		unionfs_copy_attr_times(dentry->d_inode);
 @@ -127,7 +127,7 @@ static int unionfs_rmdir_first(struct in
- 	/* avoid destroying the lower inode if the file is in use */
  	dget(lower_dentry);
- 	if (!(err = is_robranch(dentry)))
+ 	err = is_robranch(dentry);
+ 	if (!err)
 -		err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
 +		err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry, NULL);
  	dput(lower_dentry);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-unionfs-vserver.patch?r1=1.1.2.1&r2=1.1.2.2&f=u