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


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

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

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

1.1.2.3
date	2006.09.23.07.01.39;	author jsipek;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2006.10.07.06.08.03;	author jsipek;	state Exp;
branches;
next	1.1.2.5;

1.1.2.5
date	2006.10.24.06.14.17;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file sioq was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Quilt patch directory import & few small fixes
@
text
@a0 212
Unionfs: Privileged operations workqueue

From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

Workqueue & helper functions used to perform privileged operations on
behalf of the user process.

Signed-off-by: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>
Signed-off-by: David Quigley <dquigley@@fsl.cs.sunysb.edu>
Signed-off-by: Erez Zadok <ezk@@cs.sunysb.edu>

diff -r 113456e298f4 fs/unionfs/sioq.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/sioq.c	Sat Sep 16 17:32:38 2006 -0400
@@@@ -0,0 +1,114 @@@@
+/*
+ * Copyright (c) 2003-2006 Erez Zadok
+ * Copyright (c) 2003-2006 Charles P. Wright
+ * Copyright (c) 2005-2006 Josef 'Jeff' Sipek
+ * Copyright (c) 2005-2006 Junjiro Okajima
+ * Copyright (c) 2005      Arun M. Krishnakumar
+ * Copyright (c) 2004-2006 David P. Quigley
+ * Copyright (c) 2003-2004 Mohammad Nayyer Zubair
+ * Copyright (c) 2003      Puja Gupta
+ * Copyright (c) 2003      Harikesavan Krishnan
+ * Copyright (c) 2003-2006 Stony Brook University
+ * Copyright (c) 2003-2006 The Research Foundation of State University of New York
+ *
+ * For specific licensing information, see the COPYING file distributed with
+ * this package.
+ *
+ * This Copyright notice must be kept intact and distributed with all sources.
+ */
+
+#include "union.h"
+
+struct workqueue_struct *sioq;
+
+int __init init_sioq(void)
+{
+	int err;
+
+	sioq = create_workqueue("unionfs_siod");
+	if (!IS_ERR(sioq))
+		return 0;
+
+	err = PTR_ERR(sioq);
+	printk(KERN_ERR "create_workqueue failed %d\n", err);
+	sioq = NULL;
+	return err;
+}
+
+void fin_sioq(void)
+{
+	if (sioq)
+		destroy_workqueue(sioq);
+}
+
+void run_sioq(void (*func)(void *arg), struct sioq_args *args)
+{
+	DECLARE_WORK(wk, func, &args->comp);
+
+	init_completion(&args->comp);
+	while (!queue_work(sioq, &wk)) {
+		// TODO: do accounting if needed
+		schedule();
+	}
+	wait_for_completion(&args->comp);
+}
+
+void __unionfs_create(void *data)
+{
+	struct sioq_args *args = data;
+
+	args->err = vfs_create(args->u.create.parent, args->u.create.dentry,
+				args->u.create.mode, args->u.create.nd);
+	complete(&args->comp);
+}
+
+void __unionfs_mkdir(void *data)
+{
+	struct sioq_args *args = data;
+
+	args->err = vfs_mkdir(args->u.mkdir.parent, args->u.mkdir.dentry,
+				args->u.mkdir.mode);
+	complete(&args->comp);
+}
+
+void __unionfs_mknod(void *data)
+{
+	struct sioq_args *args = data;
+
+	args->err = vfs_mknod(args->u.mknod.parent, args->u.mknod.dentry,
+				args->u.mknod.mode, args->u.mknod.dev);
+	complete(&args->comp);
+}
+void __unionfs_symlink(void *data)
+{
+	struct sioq_args *args = data;
+
+	args->err = vfs_symlink(args->u.symlink.parent, args->u.symlink.dentry,
+				args->u.symlink.symbuf, args->u.symlink.mode);
+}
+
+void __unionfs_unlink(void *data)
+{
+	struct sioq_args *args = data;
+
+	args->err = vfs_unlink(args->u.unlink.parent, args->u.unlink.dentry);
+	complete(&args->comp);
+}
+
+void __delete_whiteouts(void *data) {
+	struct sioq_args *args = data;
+
+	args->err = do_delete_whiteouts(args->u.deletewh.dentry, args->u.deletewh.bindex,
+					args->u.deletewh.namelist);
+
+	complete(&args->comp);
+}
+
+void __is_opaque_dir(void *data)
+{
+	struct sioq_args *args = data;
+
+	args->ret = lookup_one_len(UNIONFS_DIR_OPAQUE, args->u.isopaque.dentry,
+				sizeof(UNIONFS_DIR_OPAQUE) - 1);
+	complete(&args->comp);
+}
diff -r 113456e298f4 fs/unionfs/sioq.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/sioq.h	Sat Sep 16 17:32:38 2006 -0400
@@@@ -0,0 +1,79 @@@@
+#ifndef _SIOQ_H
+#define _SIOQ_H
+
+struct deletewh_args {
+	struct unionfs_dir_state *namelist;
+	struct dentry *dentry;
+	int bindex;
+};
+
+struct isopaque_args {
+	struct dentry *dentry;
+};
+
+struct create_args {
+	struct inode *parent;
+	struct dentry *dentry;
+	umode_t mode;
+	struct nameidata *nd;
+};
+
+struct mkdir_args {
+	struct inode *parent;
+	struct dentry *dentry;
+	umode_t mode;
+};
+
+struct mknod_args {
+	struct inode *parent;
+	struct dentry *dentry;
+	umode_t mode;
+	dev_t dev;
+};
+
+struct symlink_args {
+	struct inode *parent;
+	struct dentry *dentry;
+	char *symbuf;
+	umode_t mode;
+};
+
+struct unlink_args {
+	struct inode *parent;
+	struct dentry *dentry;
+};
+
+
+struct sioq_args {
+
+	struct completion comp;
+	int err;
+	void *ret;
+
+	union {
+		struct deletewh_args deletewh;
+		struct isopaque_args isopaque;
+		struct create_args create;
+		struct mkdir_args mkdir;
+		struct mknod_args mknod;
+		struct symlink_args symlink;
+		struct unlink_args unlink;
+	} u;
+};
+
+extern struct workqueue_struct *sioq;
+int __init init_sioq(void);
+extern void fin_sioq(void);
+extern void run_sioq(void (*func)(void *arg), struct sioq_args *args);
+
+/* Extern definitions for our privledge escalation helpers */
+extern void __unionfs_create(void *data);
+extern void __unionfs_mkdir(void *data);
+extern void __unionfs_mknod(void *data);
+extern void __unionfs_symlink(void *data);
+extern void __unionfs_unlink(void *data);
+extern void __delete_whiteouts(void *data);
+extern void __is_opaque_dir(void *data);
+
+#endif /* _SIOQ_H */
+
@


1.1.2.2
log
@Mostly Jan's comments
@
text
@d12 1
a12 23
diff -r 04aa1b979711 fs/unionfs/main.c
--- a/fs/unionfs/main.c	Sat Sep 16 19:35:31 2006 -0400
+++ b/fs/unionfs/main.c	Sat Sep 16 19:49:55 2006 -0400
@@@@ -257,12 +257,16 @@@@ static int parse_dirs_option(struct supe
 			branches++;
 
 	/* allocate space for underlying pointers to hidden dentry */
-	if (!(stopd(sb)->usi_data = alloc_new_data(branches))) {
+	stopd(sb)->usi_data = kcalloc(branches,
+			sizeof(struct unionfs_usi_data), GFP_KERNEL);
+	if (!stopd(sb)->usi_data) {
 		err = -ENOMEM;
 		goto out;
 	}
 
-	if (!(hidden_root_info->udi_dentry = alloc_new_dentries(branches))) {
+	hidden_root_info->udi_dentry = kcalloc(branches,
+			sizeof(struct dentry *), GFP_KERNEL);
+	if (!hidden_root_info->udi_dentry) {
 		err = -ENOMEM;
 		goto out;
 	}
diff -r 04aa1b979711 fs/unionfs/sioq.c
d14 2
a15 2
+++ b/fs/unionfs/sioq.c	Sat Sep 16 19:42:09 2006 -0400
@@@@ -0,0 +1,116 @@@@
a73 1
+	struct create_args *c = &args->u.create;
d75 2
a76 1
+	args->err = vfs_create(c->parent, c->dentry, c->mode, c->nd);
a82 1
+	struct mkdir_args *m = &args->u.mkdir;
d84 2
a85 1
+	args->err = vfs_mkdir(m->parent, m->dentry, m->mode);
a91 1
+	struct mknod_args *m = &args->u.mknod;
d93 2
a94 1
+	args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev);
a99 1
+	struct symlink_args *s = &args->u.symlink;
d101 2
a102 2
+	args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode);
+	complete(&args->comp);
a107 1
+	struct unlink_args *u = &args->u.unlink;
d109 1
a109 1
+	args->err = vfs_unlink(u->parent, u->dentry);
a114 1
+	struct deletewh_args *d = &args->u.deletewh;
d116 3
a118 1
+	args->err = do_delete_whiteouts(d->dentry, d->bindex, d->namelist);
d130 1
a130 2
+
diff -r 04aa1b979711 fs/unionfs/sioq.h
d132 1
a132 1
+++ b/fs/unionfs/sioq.h	Sat Sep 16 19:36:07 2006 -0400
@


1.1.2.3
log
@Make license comments clearer
@
text
@d12 4
a15 4
diff -r 01861571a62e fs/unionfs/main.c
--- a/fs/unionfs/main.c	Sat Sep 23 02:49:54 2006 -0400
+++ b/fs/unionfs/main.c	Sat Sep 23 02:49:56 2006 -0400
@@@@ -256,12 +256,16 @@@@ static int parse_dirs_option(struct supe
d34 1
a34 1
diff -r 01861571a62e fs/unionfs/sioq.c
d36 2
a37 2
+++ b/fs/unionfs/sioq.c	Sat Sep 23 02:50:09 2006 -0400
@@@@ -0,0 +1,115 @@@@
d51 4
a54 3
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
d154 1
a154 1
diff -r 01861571a62e fs/unionfs/sioq.h
d156 1
a156 1
+++ b/fs/unionfs/sioq.h	Sat Sep 23 02:49:56 2006 -0400
@


1.1.2.4
log
@Miss-collapsed a bit of main.c
@
text
@d12 22
@


1.1.2.5
log
@Move unionfs specific bits into a subdir
@
text
@@


