SOURCES (LINUX_2_6_22): kernel-unionfs-vserver.patch - update to 2.3.3

glen glen at pld-linux.org
Sun May 18 21:11:21 CEST 2008 

Author: glen                         Date: Sun May 18 19:11:21 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6_22
---- Log message:
- update to 2.3.3

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

---- 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.1.2.1
--- SOURCES/kernel-unionfs-vserver.patch:1.1.2.1	Thu Sep 20 19:43:15 2007
+++ SOURCES/kernel-unionfs-vserver.patch	Sun May 18 21:11:15 2008
@@ -1,7 +1,6 @@
-diff -urp a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
---- a/fs/unionfs/commonfops.c	2007-09-20 16:19:41.984646750 +0200
-+++ b/fs/unionfs/commonfops.c	2007-09-20 16:25:09.237098750 +0200
-@@ -88,7 +88,7 @@ retry:
+--- linux-2.6.22/fs/unionfs/commonfops.c~	2008-05-18 19:35:41.000000000 +0300
++++ linux-2.6.22/fs/unionfs/commonfops.c	2008-05-18 21:53:35.777262423 +0300
+@@ -88,7 +88,7 @@
  					    lower_dentry->d_inode);
  	}
  	lower_dir_dentry = lock_parent(lower_dentry);
@@ -10,10 +9,9 @@
  	unlock_dir(lower_dir_dentry);
  
  out:
-diff -urp a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
---- a/fs/unionfs/copyup.c	2007-09-20 16:19:41.984646750 +0200
-+++ b/fs/unionfs/copyup.c	2007-09-20 16:25:09.237098750 +0200
-@@ -474,7 +474,7 @@ out_unlink:
+--- linux-2.6.22/fs/unionfs/copyup.c~	2008-05-18 19:35:41.000000000 +0300
++++ linux-2.6.22/fs/unionfs/copyup.c	2008-05-18 21:37:37.269847090 +0300
+@@ -482,7 +482,7 @@
  	 * quota, or something else happened so let's unlink; we don't
  	 * really care about the return value of vfs_unlink
  	 */
@@ -22,10 +20,9 @@
  
  	if (copyup_file) {
  		/* need to close the file */
-diff -urp a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
---- a/fs/unionfs/dirhelper.c	2007-09-20 16:19:41.996647500 +0200
-+++ b/fs/unionfs/dirhelper.c	2007-09-20 16:25:09.237098750 +0200
-@@ -70,7 +70,7 @@ int do_delete_whiteouts(struct dentry *d
+--- linux-2.6.22/fs/unionfs/dirhelper.c~	2008-05-18 19:35:41.000000000 +0300
++++ linux-2.6.22/fs/unionfs/dirhelper.c	2008-05-18 21:37:12.040388291 +0300
+@@ -70,7 +70,7 @@
  				break;
  			}
  			if (lower_dentry->d_inode)
@@ -34,64 +31,54 @@
  			dput(lower_dentry);
  			if (err)
  				break;
-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);
+--- linux-2.6.22/fs/unionfs/inode.c~	2008-05-18 19:35:41.000000000 +0300
++++ linux-2.6.22/fs/unionfs/inode.c	2008-05-18 21:27:05.637322201 +0300
+@@ -62,7 +62,7 @@
+ 	lower_dir_dentry = lock_parent_wh(wh_dentry);
+ 	/* see Documentation/filesystems/unionfs/issues.txt */
+ 	lockdep_off();
+-	err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
++	err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry, NULL);
+ 	lockdep_on();
+ 	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)
+@@ -341,7 +341,7 @@
+ 			/* see Documentation/filesystems/unionfs/issues.txt */
+ 			lockdep_off();
  			err = vfs_unlink(lower_dir_dentry->d_inode,
 -					 whiteout_dentry);
 +					 whiteout_dentry, NULL);
+ 			lockdep_on();
+ 		}
  
- 		fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
- 		dir->i_nlink = unionfs_get_nlinks(dir);
-@@ -357,7 +357,7 @@ static int unionfs_link(struct dentry *o
- 	lower_dir_dentry = lock_parent(lower_new_dentry);
- 	if (!(err = is_robranch(old_dentry)))
+@@ -374,7 +374,7 @@
+ 		/* see Documentation/filesystems/unionfs/issues.txt */
+ 		lockdep_off();
  		err = vfs_link(lower_old_dentry, lower_dir_dentry->d_inode,
 -			       lower_new_dentry);
 +			       lower_new_dentry, NULL);
+ 		lockdep_on();
+ 	}
  	unlock_dir(lower_dir_dentry);
+@@ -403,7 +403,7 @@
+ 			/* do vfs_link */
+ 			err = vfs_link(lower_old_dentry,
+ 				       lower_dir_dentry->d_inode,
+-				       lower_new_dentry);
++				       lower_new_dentry, NULL);
+ 			lockdep_on();
+ 			unlock_dir(lower_dir_dentry);
+ 			goto check_link;
+@@ -491,7 +491,7 @@
  
- docopyup:
-@@ -383,7 +383,7 @@ docopyup:
- 				/* do vfs_link */
- 				err = vfs_link(lower_old_dentry,
- 					       lower_dir_dentry->d_inode,
--					       lower_new_dentry);
-+					       lower_new_dentry, NULL);
- 				unlock_dir(lower_dir_dentry);
- 				goto check_link;
- 			}
-@@ -480,7 +480,7 @@ static int unionfs_symlink(struct inode 
- 
- 		if (!(err = is_robranch_super(dentry->d_sb, bstart)))
- 			err = vfs_unlink(lower_dir_dentry->d_inode,
--					 whiteout_dentry);
-+					 whiteout_dentry, NULL);
- 		dput(whiteout_dentry);
- 
- 		fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
-@@ -536,7 +536,7 @@ static int unionfs_symlink(struct inode 
- 			mode = S_IALLUGO;
- 			err =
- 				vfs_symlink(lower_dir_dentry->d_inode,
--					    lower_dentry, symname, mode);
-+					    lower_dentry, symname, mode, NULL);
- 		}
- 		unlock_dir(lower_dir_dentry);
- 
-@@ -680,7 +680,7 @@ static int unionfs_mkdir(struct inode *p
+ 	mode = S_IALLUGO;
+ 	err = vfs_symlink(lower_parent_dentry->d_inode, lower_dentry,
+-			  symname, mode);
++			  symname, mode, NULL);
+ 	if (!err) {
+ 		err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
+ 		if (!err) {
+@@ -622,7 +622,7 @@
  		}
  
  		err = vfs_mkdir(lower_parent_dentry->d_inode, lower_dentry,
@@ -100,49 +87,38 @@
  
  		unlock_dir(lower_parent_dentry);
  
-@@ -787,7 +787,7 @@ static int unionfs_mknod(struct inode *d
- 		/* found a.wh.foo entry, remove it then do vfs_mkdir */
- 		if (!(err = is_robranch_super(dentry->d_sb, bstart)))
- 			err = vfs_unlink(lower_parent_dentry->d_inode,
--					 whiteout_dentry);
-+					 whiteout_dentry, NULL);
- 		dput(whiteout_dentry);
- 
- 		unlock_dir(lower_parent_dentry);
-@@ -824,7 +824,7 @@ static int unionfs_mknod(struct inode *d
- 		}
+@@ -725,7 +725,7 @@
+ 		goto out;
+ 	}
  
- 		err = vfs_mknod(lower_parent_dentry->d_inode,
--				lower_dentry, mode, dev);
-+				lower_dentry, mode, dev, NULL);
- 
- 		if (err) {
- 			unlock_dir(lower_parent_dentry);
-diff -urp a/fs/unionfs/rename.c b/fs/unionfs/rename.c
---- a/fs/unionfs/rename.c	2007-09-20 16:19:42.000647750 +0200
-+++ b/fs/unionfs/rename.c	2007-09-20 16:25:09.249099500 +0200
-@@ -77,7 +77,7 @@ static int __unionfs_rename(struct inode
- 		lower_wh_dir_dentry = lock_parent(lower_wh_dentry);
- 		if (!(err = is_robranch_super(old_dentry->d_sb, bindex)))
+-	err = vfs_mknod(lower_parent_dentry->d_inode, lower_dentry, mode, dev);
++	err = vfs_mknod(lower_parent_dentry->d_inode, lower_dentry, mode, dev, NULL);
+ 	if (!err) {
+ 		err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
+ 		if (!err) {
+--- linux-2.6.22/fs/unionfs/rename.c~	2008-05-18 19:35:41.000000000 +0300
++++ linux-2.6.22/fs/unionfs/rename.c	2008-05-18 21:52:05.956070003 +0300
+@@ -81,7 +81,7 @@
+ 		err = is_robranch_super(old_dentry->d_sb, bindex);
+ 		if (!err)
  			err = vfs_unlink(lower_wh_dir_dentry->d_inode,
 -					 lower_wh_dentry);
 +					 lower_wh_dentry, NULL);
  
  		dput(lower_wh_dentry);
  		unlock_dir(lower_wh_dir_dentry);
-@@ -196,7 +196,7 @@ static int do_unionfs_rename(struct inod
- 		unlink_dir_dentry = lock_parent(unlink_dentry);
- 		if (!(err = is_robranch_super(old_dir->i_sb, bindex)))
+@@ -222,7 +222,7 @@
+ 		err = is_robranch_super(old_dir->i_sb, bindex);
+ 		if (!err)
  			err = vfs_unlink(unlink_dir_dentry->d_inode,
 -					 unlink_dentry);
 +					 unlink_dentry, NULL);
  
  		fsstack_copy_attr_times(new_dentry->d_parent->d_inode,
  					unlink_dir_dentry->d_inode);
-diff -urp a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
---- a/fs/unionfs/sioq.c	2007-09-20 16:19:42.000647750 +0200
-+++ b/fs/unionfs/sioq.c	2007-09-20 16:25:09.249099500 +0200
-@@ -69,7 +69,7 @@ void __unionfs_mkdir(struct work_struct 
+--- linux-2.6.22/fs/unionfs/sioq.c~	2008-05-18 19:35:41.000000000 +0300
++++ linux-2.6.22/fs/unionfs/sioq.c	2008-05-18 21:54:31.272470465 +0300
+@@ -69,7 +69,7 @@
  	struct sioq_args *args = container_of(work, struct sioq_args, work);
  	struct mkdir_args *m = &args->mkdir;
  
@@ -151,7 +127,7 @@
  	complete(&args->comp);
  }
  
-@@ -78,7 +78,7 @@ void __unionfs_mknod(struct work_struct 
+@@ -78,7 +78,7 @@
  	struct sioq_args *args = container_of(work, struct sioq_args, work);
  	struct mknod_args *m = &args->mknod;
  
@@ -160,7 +136,7 @@
  	complete(&args->comp);
  }
  
-@@ -87,7 +87,7 @@ void __unionfs_symlink(struct work_struc
+@@ -87,7 +87,7 @@
  	struct sioq_args *args = container_of(work, struct sioq_args, work);
  	struct symlink_args *s = &args->symlink;
  
@@ -169,7 +145,7 @@
  	complete(&args->comp);
  }
  
-@@ -96,7 +96,7 @@ void __unionfs_unlink(struct work_struct
+@@ -96,7 +96,7 @@
  	struct sioq_args *args = container_of(work, struct sioq_args, work);
  	struct unlink_args *u = &args->unlink;
  
@@ -178,24 +154,27 @@
  	complete(&args->comp);
  }
  
-diff -urp a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
---- 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 = 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)))
+--- linux-2.6.22/fs/unionfs/unlink.c~	2008-05-18 19:35:41.000000000 +0300
++++ linux-2.6.22/fs/unionfs/unlink.c	2008-05-18 21:53:00.271209886 +0300
+@@ -71,10 +71,10 @@
+ 			lockdep_off();
+ 			if (!S_ISDIR(lower_dentry->d_inode->i_mode))
+ 				err = vfs_unlink(lower_dir_dentry->d_inode,
+-								lower_dentry);
++								lower_dentry, NULL);
+ 			else
+ 				err = vfs_rmdir(lower_dir_dentry->d_inode,
+-								lower_dentry);
++								lower_dentry, NULL);
+ 			lockdep_on();
+ 		}
+ 
+@@ -193,7 +193,7 @@
+ 	if (!err) {
+ 		/* see Documentation/filesystems/unionfs/issues.txt */
+ 		lockdep_off();
 -		err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
 +		err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry, NULL);
+ 		lockdep_on();
+ 	}
  	dput(lower_dentry);
- 
- 	fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
================================================================

---- 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.1.2.1&f=u

More information about the pld-cvs-commit mailing list