head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.29.06.19.42;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.29.06.19.42;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.11.07.06.13.33;	author jsipek;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.11.28.08.06.50;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file unionfs-annonymous-unions was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Convert sioq to anonymous unions
@
text
@a0 188
diff -r 4dc709bf5aa8 fs/unionfs/copyup.c
--- a/fs/unionfs/copyup.c	Sun Oct 29 01:07:02 2006 -0500
+++ b/fs/unionfs/copyup.c	Sun Oct 29 01:14:19 2006 -0500
@@@@ -138,17 +138,17 @@@@ static inline int __copyup_ndentry(struc
 	struct sioq_args args;
 
 	if (S_ISDIR(old_mode)) {
-		args.u.mkdir.parent = new_hidden_parent_dentry->d_inode;
-		args.u.mkdir.dentry = new_hidden_dentry;
-		args.u.mkdir.mode = old_mode;
+		args.mkdir.parent = new_hidden_parent_dentry->d_inode;
+		args.mkdir.dentry = new_hidden_dentry;
+		args.mkdir.mode = old_mode;
 
 		run_sioq(__unionfs_mkdir, &args);
 		err = args.err;
 	} else if (S_ISLNK(old_mode)) {
-		args.u.symlink.parent = new_hidden_parent_dentry->d_inode;
-		args.u.symlink.dentry = new_hidden_dentry;
-		args.u.symlink.symbuf = symbuf;
-		args.u.symlink.mode = old_mode;
+		args.symlink.parent = new_hidden_parent_dentry->d_inode;
+		args.symlink.dentry = new_hidden_dentry;
+		args.symlink.symbuf = symbuf;
+		args.symlink.mode = old_mode;
 
 		run_sioq(__unionfs_symlink, &args);
 		err = args.err;
@@@@ -156,18 +156,18 @@@@ static inline int __copyup_ndentry(struc
 		   || S_ISCHR(old_mode)
 		   || S_ISFIFO(old_mode)
 		   || S_ISSOCK(old_mode)) {
-		args.u.mknod.parent = new_hidden_parent_dentry->d_inode;
-		args.u.mknod.dentry = new_hidden_dentry;
-		args.u.mknod.mode = old_mode;
-		args.u.mknod.dev = old_hidden_dentry->d_inode->i_rdev;
+		args.mknod.parent = new_hidden_parent_dentry->d_inode;
+		args.mknod.dentry = new_hidden_dentry;
+		args.mknod.mode = old_mode;
+		args.mknod.dev = old_hidden_dentry->d_inode->i_rdev;
 
 		run_sioq(__unionfs_mknod, &args);
 		err = args.err;
 	} else if (S_ISREG(old_mode)) {
-		args.u.create.parent = new_hidden_parent_dentry->d_inode;
-		args.u.create.dentry = new_hidden_dentry;
-		args.u.create.mode = old_mode;
-		args.u.create.nd = NULL;
+		args.create.parent = new_hidden_parent_dentry->d_inode;
+		args.create.dentry = new_hidden_dentry;
+		args.create.mode = old_mode;
+		args.create.nd = NULL;
 
 		run_sioq(__unionfs_create, &args);
 		err = args.err;
@@@@ -699,9 +699,9 @@@@ struct dentry *create_parents_named(stru
 			/* its a negative dentry, create a new dir */
 			hidden_parent_dentry = lock_parent(hidden_dentry);
 
-			args.u.mkdir.parent = hidden_parent_dentry->d_inode;
-			args.u.mkdir.dentry = hidden_dentry;
-			args.u.mkdir.mode = child_dentry->d_inode->i_mode;
+			args.mkdir.parent = hidden_parent_dentry->d_inode;
+			args.mkdir.dentry = hidden_dentry;
+			args.mkdir.mode = child_dentry->d_inode->i_mode;
 
 			run_sioq(__unionfs_mkdir, &args);
 			err = args.err;
diff -r 4dc709bf5aa8 fs/unionfs/dirhelper.c
--- a/fs/unionfs/dirhelper.c	Sun Oct 29 01:07:02 2006 -0500
+++ b/fs/unionfs/dirhelper.c	Sun Oct 29 01:14:28 2006 -0500
@@@@ -110,9 +110,9 @@@@ int delete_whiteouts(struct dentry *dent
 	if (!permission(hidden_dir, MAY_WRITE | MAY_EXEC, NULL))
 		err = do_delete_whiteouts(dentry, bindex, namelist);
 	else {
-		args.u.deletewh.namelist = namelist;
-		args.u.deletewh.dentry = dentry;
-		args.u.deletewh.bindex = bindex;
+		args.deletewh.namelist = namelist;
+		args.deletewh.dentry = dentry;
+		args.deletewh.bindex = bindex;
 		run_sioq(__delete_whiteouts, &args);
 		err = args.err;
 	}
diff -r 4dc709bf5aa8 fs/unionfs/inode.c
--- a/fs/unionfs/inode.c	Sun Oct 29 01:07:02 2006 -0500
+++ b/fs/unionfs/inode.c	Sun Oct 29 01:14:39 2006 -0500
@@@@ -493,8 +493,8 @@@@ static int unionfs_mkdir(struct inode *p
 
 		/* found a.wh.foo entry, remove it then do vfs_mkdir */
 		if (!(err = is_robranch_super(dentry->d_sb, bstart))) {
-			args.u.unlink.parent = hidden_parent_dentry->d_inode;
-			args.u.unlink.dentry = whiteout_dentry;
+			args.unlink.parent = hidden_parent_dentry->d_inode;
+			args.unlink.dentry = whiteout_dentry;
 			run_sioq(__unionfs_unlink, &args);
 			err = args.err;
 		}
diff -r 4dc709bf5aa8 fs/unionfs/lookup.c
--- a/fs/unionfs/lookup.c	Sun Oct 29 01:07:02 2006 -0500
+++ b/fs/unionfs/lookup.c	Sun Oct 29 01:14:54 2006 -0500
@@@@ -362,7 +362,7 @@@@ static int is_opaque_dir(struct dentry *
 		wh_hidden_dentry = lookup_one_len(UNIONFS_DIR_OPAQUE, hidden_dentry,
 					sizeof(UNIONFS_DIR_OPAQUE) - 1);
 	else {
-		args.u.isopaque.dentry = hidden_dentry;
+		args.isopaque.dentry = hidden_dentry;
 		run_sioq(__is_opaque_dir, &args);
 		wh_hidden_dentry = args.ret;
 	}
diff -r 4dc709bf5aa8 fs/unionfs/sioq.c
--- a/fs/unionfs/sioq.c	Sun Oct 29 01:07:02 2006 -0500
+++ b/fs/unionfs/sioq.c	Sun Oct 29 01:15:30 2006 -0500
@@@@ -55,7 +55,7 @@@@ void __unionfs_create(void *data)
 void __unionfs_create(void *data)
 {
 	struct sioq_args *args = data;
-	struct create_args *c = &args->u.create;
+	struct create_args *c = &args->create;
 
 	args->err = vfs_create(c->parent, c->dentry, c->mode, c->nd);
 	complete(&args->comp);
@@@@ -64,7 +64,7 @@@@ void __unionfs_mkdir(void *data)
 void __unionfs_mkdir(void *data)
 {
 	struct sioq_args *args = data;
-	struct mkdir_args *m = &args->u.mkdir;
+	struct mkdir_args *m = &args->mkdir;
 
 	args->err = vfs_mkdir(m->parent, m->dentry, m->mode);
 	complete(&args->comp);
@@@@ -73,7 +73,7 @@@@ void __unionfs_mknod(void *data)
 void __unionfs_mknod(void *data)
 {
 	struct sioq_args *args = data;
-	struct mknod_args *m = &args->u.mknod;
+	struct mknod_args *m = &args->mknod;
 
 	args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev);
 	complete(&args->comp);
@@@@ -81,7 +81,7 @@@@ void __unionfs_symlink(void *data)
 void __unionfs_symlink(void *data)
 {
 	struct sioq_args *args = data;
-	struct symlink_args *s = &args->u.symlink;
+	struct symlink_args *s = &args->symlink;
 
 	args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode);
 	complete(&args->comp);
@@@@ -90,7 +90,7 @@@@ void __unionfs_unlink(void *data)
 void __unionfs_unlink(void *data)
 {
 	struct sioq_args *args = data;
-	struct unlink_args *u = &args->u.unlink;
+	struct unlink_args *u = &args->unlink;
 
 	args->err = vfs_unlink(u->parent, u->dentry);
 	complete(&args->comp);
@@@@ -98,7 +98,7 @@@@ void __unionfs_unlink(void *data)
 
 void __delete_whiteouts(void *data) {
 	struct sioq_args *args = data;
-	struct deletewh_args *d = &args->u.deletewh;
+	struct deletewh_args *d = &args->deletewh;
 
 	args->err = do_delete_whiteouts(d->dentry, d->bindex, d->namelist);
 	complete(&args->comp);
@@@@ -108,7 +108,7 @@@@ void __is_opaque_dir(void *data)
 {
 	struct sioq_args *args = data;
 
-	args->ret = lookup_one_len(UNIONFS_DIR_OPAQUE, args->u.isopaque.dentry,
+	args->ret = lookup_one_len(UNIONFS_DIR_OPAQUE, args->isopaque.dentry,
 				sizeof(UNIONFS_DIR_OPAQUE) - 1);
 	complete(&args->comp);
 }
diff -r 4dc709bf5aa8 fs/unionfs/sioq.h
--- a/fs/unionfs/sioq.h	Sun Oct 29 01:07:02 2006 -0500
+++ b/fs/unionfs/sioq.h	Sun Oct 29 01:13:35 2006 -0500
@@@@ -58,7 +58,7 @@@@ struct sioq_args {
 		struct mknod_args mknod;
 		struct symlink_args symlink;
 		struct unlink_args unlink;
-	} u;
+	};
 };
 
 extern struct workqueue_struct *sioq;
@


1.1.2.2
log
@Git generates slightly different diffs - same information, just little
different
@
text
@d1 3
a3 4
diff --git a/fs/unionfs/copyup.c b/fs/unionfs/copyup.c
index 0cb5d89..12b9afa 100644
--- a/fs/unionfs/copyup.c
+++ b/fs/unionfs/copyup.c
d69 3
a71 4
diff --git a/fs/unionfs/dirhelper.c b/fs/unionfs/dirhelper.c
index b70dd68..daf2aa4 100644
--- a/fs/unionfs/dirhelper.c
+++ b/fs/unionfs/dirhelper.c
d85 3
a87 4
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index a7db48a..4b6fbf2 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
d99 3
a101 4
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index 046f42c..6d6c80c 100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
d111 4
a114 5
diff --git a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
index 4d1fb0a..187ad87 100644
--- a/fs/unionfs/sioq.c
+++ b/fs/unionfs/sioq.c
@@@@ -55,7 +55,7 @@@@ void run_sioq(void (*func)(void *arg), s
d123 1
a123 1
@@@@ -64,7 +64,7 @@@@ void __unionfs_create(void *data)
d132 1
a132 1
@@@@ -73,7 +73,7 @@@@ void __unionfs_mkdir(void *data)
d141 1
a141 1
@@@@ -81,7 +81,7 @@@@ void __unionfs_mknod(void *data)
d150 1
a150 1
@@@@ -90,7 +90,7 @@@@ void __unionfs_symlink(void *data)
d177 3
a179 4
diff --git a/fs/unionfs/sioq.h b/fs/unionfs/sioq.h
index 9c39748..628d214 100644
--- a/fs/unionfs/sioq.h
+++ b/fs/unionfs/sioq.h
@


1.1.2.3
log
@Sync...
@
text
@@


