[packages/kernel.git] / kernel-unionfs-vserver.patch

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:
 					    lower_dentry->d_inode);
 	}
 	lower_dir_dentry = lock_parent(lower_dentry);
-	err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
+	err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry, NULL);
 	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:
 	 * quota, or something else happened so let's unlink; we don't
 	 * really care about the return value of vfs_unlink
 	 */
-	vfs_unlink(new_lower_parent_dentry->d_inode, new_lower_dentry);
+	vfs_unlink(new_lower_parent_dentry->d_inode, new_lower_dentry, NULL);
 
 	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
 				break;
 			}
 			if (lower_dentry->d_inode)
-				err = vfs_unlink(lower_dir, lower_dentry);
+				err = vfs_unlink(lower_dir, lower_dentry, NULL);
 			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
@@ -89,7 +89,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);
 
@@ -282,7 +282,7 @@
 			/* see Documentation/filesystems/unionfs/issues.txt */
 			lockdep_off();
 			err = vfs_unlink(lower_dir_dentry->d_inode,
-					 whiteout_dentry);
+					 whiteout_dentry, NULL);
 			lockdep_on();
 		}
 
@@ -315,7 +315,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);
@@ -348,7 +348,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;
@@ -505,7 +505,7 @@
 
 	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) {
@@ -629,7 +629,7 @@
 		}
 
 		err = vfs_mkdir(lower_parent_dentry->d_inode, lower_dentry,
-				mode);
+				mode, NULL);
 
 		unlock_dir(lower_parent_dentry);
 
@@ -799,7 +799,7 @@
 		goto out;
 	}
 
-	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) {
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_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)))
 			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 
 	struct sioq_args *args = container_of(work, struct sioq_args, work);
 	struct mkdir_args *m = &args->mkdir;
 
-	args->err = vfs_mkdir(m->parent, m->dentry, m->mode);
+	args->err = vfs_mkdir(m->parent, m->dentry, m->mode, NULL);
 	complete(&args->comp);
 }
 
@@ -78,7 +78,7 @@ void __unionfs_mknod(struct work_struct 
 	struct sioq_args *args = container_of(work, struct sioq_args, work);
 	struct mknod_args *m = &args->mknod;
 
-	args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev);
+	args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev, NULL);
 	complete(&args->comp);
 }
 
@@ -87,7 +87,7 @@ void __unionfs_symlink(struct work_struc
 	struct sioq_args *args = container_of(work, struct sioq_args, work);
 	struct symlink_args *s = &args->symlink;
 
-	args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode);
+	args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode, NULL);
 	complete(&args->comp);
 }
 
@@ -96,7 +96,7 @@ void __unionfs_unlink(struct work_struct
 	struct sioq_args *args = container_of(work, struct sioq_args, work);
 	struct unlink_args *u = &args->unlink;
 
-	args->err = vfs_unlink(u->parent, u->dentry);
+	args->err = vfs_unlink(u->parent, u->dentry, NULL);
 	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
@@ -44,7 +44,7 @@
 	if (!err) {
 		/* see Documentation/filesystems/unionfs/issues.txt */
 		lockdep_off();
-		err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
+		err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry, NULL);
 		lockdep_on();
 	}
 	/* if vfs_unlink succeeded, update our inode's times */
@@ -153,7 +153,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);
Commit	Line	Data
e0d4e42b	1	diff -urp a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
	2	--- a/fs/unionfs/commonfops.c 2007-09-20 16:19:41.984646750 +0200
	3	+++ b/fs/unionfs/commonfops.c 2007-09-20 16:25:09.237098750 +0200
	4	@@ -88,7 +88,7 @@ retry:
	5	lower_dentry->d_inode);
	6	}
	7	lower_dir_dentry = lock_parent(lower_dentry);
	8	- err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
	9	+ err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry, NULL);
	10	unlock_dir(lower_dir_dentry);
	11
	12	out:
	13	diff -urp a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
	14	--- a/fs/unionfs/copyup.c 2007-09-20 16:19:41.984646750 +0200
	15	+++ b/fs/unionfs/copyup.c 2007-09-20 16:25:09.237098750 +0200
	16	@@ -474,7 +474,7 @@ out_unlink:
	17	* quota, or something else happened so let's unlink; we don't
	18	* really care about the return value of vfs_unlink
	19	*/
	20	- vfs_unlink(new_lower_parent_dentry->d_inode, new_lower_dentry);
	21	+ vfs_unlink(new_lower_parent_dentry->d_inode, new_lower_dentry, NULL);
	22
	23	if (copyup_file) {
	24	/* need to close the file */
	25	diff -urp a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
	26	--- a/fs/unionfs/dirhelper.c 2007-09-20 16:19:41.996647500 +0200
	27	+++ b/fs/unionfs/dirhelper.c 2007-09-20 16:25:09.237098750 +0200
	28	@@ -70,7 +70,7 @@ int do_delete_whiteouts(struct dentry *d
	29	break;
	30	}
	31	if (lower_dentry->d_inode)
	32	- err = vfs_unlink(lower_dir, lower_dentry);
	33	+ err = vfs_unlink(lower_dir, lower_dentry, NULL);
	34	dput(lower_dentry);
	35	if (err)
	36	break;
	37	diff -urp a/fs/unionfs/inode.c b/fs/unionfs/inode.c
	38	--- a/fs/unionfs/inode.c 2007-09-20 16:19:41.996647500 +0200
	39	+++ b/fs/unionfs/inode.c 2007-09-20 16:25:09.241099000 +0200
f5d378f3	40	@@ -89,7 +89,7 @@
a3d014de	41	lower_dir_dentry = lock_parent_wh(wh_dentry);
	42	/* see Documentation/filesystems/unionfs/issues.txt */
	43	lockdep_off();
	44	- err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
	45	+ err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry, NULL);
	46	lockdep_on();
	47	unlock_dir(lower_dir_dentry);
c9a15a55	48
f5d378f3 AM	49	@@ -282,7 +282,7 @@
	50	/* see Documentation/filesystems/unionfs/issues.txt */
	51	lockdep_off();
e0d4e42b	52	err = vfs_unlink(lower_dir_dentry->d_inode,
	53	- whiteout_dentry);
	54	+ whiteout_dentry, NULL);
f5d378f3 AM	55	lockdep_on();
f5d378f3 AM	56	}
e0d4e42b	57
f5d378f3 AM	58	@@ -315,7 +315,7 @@
	59	/* see Documentation/filesystems/unionfs/issues.txt */
	60	lockdep_off();
e0d4e42b	61	err = vfs_link(lower_old_dentry, lower_dir_dentry->d_inode,
	62	- lower_new_dentry);
	63	+ lower_new_dentry, NULL);
f5d378f3 AM	64	lockdep_on();
f5d378f3 AM	65	}
e0d4e42b	66	unlock_dir(lower_dir_dentry);
f5d378f3	67	@@ -348,7 +348,7 @@
e0d4e42b	68	/* do vfs_link */
	69	err = vfs_link(lower_old_dentry,
	70	lower_dir_dentry->d_inode,
	71	- lower_new_dentry);
	72	+ lower_new_dentry, NULL);
f5d378f3	73	lockdep_on();
e0d4e42b	74	unlock_dir(lower_dir_dentry);
e0d4e42b	75	goto check_link;
f5d378f3	76	@@ -505,7 +505,7 @@
e0d4e42b	77
f5d378f3 AM	78	mode = S_IALLUGO;
	79	err = vfs_symlink(lower_parent_dentry->d_inode, lower_dentry,
	80	- symname, mode);
	81	+ symname, mode, NULL);
	82	if (!err) {
	83	err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
	84	if (!err) {
	85	@@ -629,7 +629,7 @@
e0d4e42b	86	}
	87
	88	err = vfs_mkdir(lower_parent_dentry->d_inode, lower_dentry,
	89	- mode);
	90	+ mode, NULL);
	91
	92	unlock_dir(lower_parent_dentry);
	93
f5d378f3 AM	94	@@ -799,7 +799,7 @@
	95	goto out;
	96	}
e0d4e42b	97
f5d378f3 AM	98	- err = vfs_mknod(lower_parent_dentry->d_inode, lower_dentry, mode, dev);
	99	+ err = vfs_mknod(lower_parent_dentry->d_inode, lower_dentry, mode, dev, NULL);
	100	if (!err) {
	101	err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
	102	if (!err) {
e0d4e42b	103	diff -urp a/fs/unionfs/rename.c b/fs/unionfs/rename.c
	104	--- a/fs/unionfs/rename.c 2007-09-20 16:19:42.000647750 +0200
	105	+++ b/fs/unionfs/rename.c 2007-09-20 16:25:09.249099500 +0200
	106	@@ -77,7 +77,7 @@ static int __unionfs_rename(struct inode
	107	lower_wh_dir_dentry = lock_parent(lower_wh_dentry);
	108	if (!(err = is_robranch_super(old_dentry->d_sb, bindex)))
	109	err = vfs_unlink(lower_wh_dir_dentry->d_inode,
	110	- lower_wh_dentry);
	111	+ lower_wh_dentry, NULL);
	112
	113	dput(lower_wh_dentry);
	114	unlock_dir(lower_wh_dir_dentry);
	115	@@ -196,7 +196,7 @@ static int do_unionfs_rename(struct inod
	116	unlink_dir_dentry = lock_parent(unlink_dentry);
	117	if (!(err = is_robranch_super(old_dir->i_sb, bindex)))
	118	err = vfs_unlink(unlink_dir_dentry->d_inode,
	119	- unlink_dentry);
	120	+ unlink_dentry, NULL);
	121
	122	fsstack_copy_attr_times(new_dentry->d_parent->d_inode,
	123	unlink_dir_dentry->d_inode);
	124	diff -urp a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
	125	--- a/fs/unionfs/sioq.c 2007-09-20 16:19:42.000647750 +0200
	126	+++ b/fs/unionfs/sioq.c 2007-09-20 16:25:09.249099500 +0200
	127	@@ -69,7 +69,7 @@ void __unionfs_mkdir(struct work_struct
	128	struct sioq_args *args = container_of(work, struct sioq_args, work);
	129	struct mkdir_args *m = &args->mkdir;
	130
	131	- args->err = vfs_mkdir(m->parent, m->dentry, m->mode);
	132	+ args->err = vfs_mkdir(m->parent, m->dentry, m->mode, NULL);
	133	complete(&args->comp);
	134	}
	135
	136	@@ -78,7 +78,7 @@ void __unionfs_mknod(struct work_struct
	137	struct sioq_args *args = container_of(work, struct sioq_args, work);
	138	struct mknod_args *m = &args->mknod;
	139
	140	- args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev);
	141	+ args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev, NULL);
	142	complete(&args->comp);
	143	}
	144
	145	@@ -87,7 +87,7 @@ void __unionfs_symlink(struct work_struc
	146	struct sioq_args *args = container_of(work, struct sioq_args, work);
	147	struct symlink_args *s = &args->symlink;
	148
	149	- args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode);
	150	+ args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode, NULL);
	151	complete(&args->comp);
	152	}
	153
	154	@@ -96,7 +96,7 @@ void __unionfs_unlink(struct work_struct
	155	struct sioq_args *args = container_of(work, struct sioq_args, work);
	156	struct unlink_args *u = &args->unlink;
	157
	158	- args->err = vfs_unlink(u->parent, u->dentry);
	159	+ args->err = vfs_unlink(u->parent, u->dentry, NULL);
	160	complete(&args->comp);
	161	}
	162
	163	diff -urp a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
	164	--- a/fs/unionfs/unlink.c 2007-09-20 16:19:42.004648000 +0200
	165	+++ b/fs/unionfs/unlink.c 2007-09-20 16:25:09.253099750 +0200
f5d378f3 AM	166	@@ -44,7 +44,7 @@
	167	if (!err) {
	168	/* see Documentation/filesystems/unionfs/issues.txt */
	169	lockdep_off();
e0d4e42b	170	- err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
e0d4e42b	171	+ err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry, NULL);
f5d378f3 AM	172	lockdep_on();
f5d378f3 AM	173	}
e0d4e42b	174	/* if vfs_unlink succeeded, update our inode's times */
f5d378f3 AM	175	@@ -153,7 +153,7 @@
	176	if (!err) {
	177	/* see Documentation/filesystems/unionfs/issues.txt */
	178	lockdep_off();
e0d4e42b	179	- err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
e0d4e42b	180	+ err = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry, NULL);
f5d378f3 AM	181	lockdep_on();
f5d378f3 AM	182	}
e0d4e42b	183	dput(lower_dentry);