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


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

1.1.2.1
date	2006.10.24.06.14.17;	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 Exp;
branches;
next	1.1.2.4;

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

1.1.2.5
date	2006.12.01.02.36.12;	author jsipek;	state Exp;
branches;
next	1.1.2.6;

1.1.2.6
date	2006.12.11.14.23.59;	author jsipek;	state Exp;
branches;
next	1.1.2.7;

1.1.2.7
date	2007.01.04.22.12.00;	author jsipek;	state Exp;
branches;
next	1.1.2.8;

1.1.2.8
date	2007.01.21.23.59.13;	author jsipek;	state Exp;
branches;
next	;


desc
@@


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


1.1.2.1
log
@Move unionfs specific bits into a subdir
@
text
@a0 213
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 01861571a62e fs/unionfs/sioq.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/sioq.c	Sat Sep 23 02:50:09 2006 -0400
@@@@ -0,0 +1,115 @@@@
+/*
+ * 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
+ *
+ * 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.
+ */
+
+#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;
+	struct create_args *c = &args->u.create;
+
+	args->err = vfs_create(c->parent, c->dentry, c->mode, c->nd);
+	complete(&args->comp);
+}
+
+void __unionfs_mkdir(void *data)
+{
+	struct sioq_args *args = data;
+	struct mkdir_args *m = &args->u.mkdir;
+
+	args->err = vfs_mkdir(m->parent, m->dentry, m->mode);
+	complete(&args->comp);
+}
+
+void __unionfs_mknod(void *data)
+{
+	struct sioq_args *args = data;
+	struct mknod_args *m = &args->u.mknod;
+
+	args->err = vfs_mknod(m->parent, m->dentry, m->mode, m->dev);
+	complete(&args->comp);
+}
+void __unionfs_symlink(void *data)
+{
+	struct sioq_args *args = data;
+	struct symlink_args *s = &args->u.symlink;
+
+	args->err = vfs_symlink(s->parent, s->dentry, s->symbuf, s->mode);
+	complete(&args->comp);
+}
+
+void __unionfs_unlink(void *data)
+{
+	struct sioq_args *args = data;
+	struct unlink_args *u = &args->u.unlink;
+
+	args->err = vfs_unlink(u->parent, u->dentry);
+	complete(&args->comp);
+}
+
+void __delete_whiteouts(void *data) {
+	struct sioq_args *args = data;
+	struct deletewh_args *d = &args->u.deletewh;
+
+	args->err = do_delete_whiteouts(d->dentry, d->bindex, d->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 01861571a62e fs/unionfs/sioq.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/sioq.h	Sat Sep 23 02:49:56 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
@Git generates slightly different diffs - same information, just little
different
@
text
@d12 3
a14 5
diff --git a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
new file mode 100644
index 0000000..6001d48
--- /dev/null
+++ b/fs/unionfs/sioq.c
d131 3
a133 5
diff --git a/fs/unionfs/sioq.h b/fs/unionfs/sioq.h
new file mode 100644
index 0000000..9c39748
--- /dev/null
+++ b/fs/unionfs/sioq.h
@


1.1.2.3
log
@Sync...
@
text
@d15 2
a16 4

diff -r 353f43fd125b fs/unionfs/sioq.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/sioq.c	Tue Nov 28 02:57:06 2006 -0500
d75 1
a75 1
+	struct create_args *c = &args->create;
d84 1
a84 1
+	struct mkdir_args *m = &args->mkdir;
d93 1
a93 1
+	struct mknod_args *m = &args->mknod;
d101 1
a101 1
+	struct symlink_args *s = &args->symlink;
d110 1
a110 1
+	struct unlink_args *u = &args->unlink;
d118 1
a118 1
+	struct deletewh_args *d = &args->deletewh;
d128 1
a128 1
+	args->ret = lookup_one_len(UNIONFS_DIR_OPAQUE, args->isopaque.dentry,
d133 5
a137 3
diff -r 353f43fd125b fs/unionfs/sioq.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/sioq.h	Tue Nov 28 02:57:18 2006 -0500
d199 1
a199 1
+	};
@


1.1.2.4
log
@Collapsed: struct_path-unionfs unionfs-fix-comments unionfs-kill-wrappers
@
text
@d16 1
a16 1
diff -r 3b0b34ba0e9a fs/unionfs/sioq.c
d18 1
a18 1
+++ b/fs/unionfs/sioq.c	Tue Nov 28 03:19:06 2006 -0500
d68 1
a68 1
+		/* TODO: do accounting if needed */
d135 1
a135 1
diff -r 3b0b34ba0e9a fs/unionfs/sioq.h
d137 1
a137 1
+++ b/fs/unionfs/sioq.h	Tue Nov 28 03:19:02 2006 -0500
@


1.1.2.5
log
@Remove git crud & nicer makefile
@
text
@d12 4
@


1.1.2.6
log
@Folded unionfs-lkml-comments-jan
@
text
@d12 1
a12 1
diff -r 505d828992aa fs/unionfs/sioq.c
d14 2
a15 2
+++ b/fs/unionfs/sioq.c	Mon Dec 11 09:07:21 2006 -0500
@@@@ -0,0 +1,122 @@@@
a35 6
+/* Super-user IO work Queue - sometimes we need to perform actions which
+ * would fail due to the unix permissions on the parent directory (e.g.,
+ * rmdir a directory which appears empty, but in reality contains
+ * whiteouts).
+ */
+
d52 1
a52 1
+void __exit stop_sioq(void)
a95 1
+
d126 1
a126 1
+	args->ret = lookup_one_len(UNIONFS_DIR_OPAQUE, args->is_opaque.dentry,
d131 1
a131 1
diff -r 505d828992aa fs/unionfs/sioq.h
d133 1
a133 1
+++ b/fs/unionfs/sioq.h	Mon Dec 11 09:07:23 2006 -0500
d144 1
a144 1
+struct is_opaque_args {
d189 1
a189 1
+		struct is_opaque_args is_opaque;
d199 2
a200 2
+extern int __init init_sioq(void);
+extern __exit void stop_sioq(void);
d203 1
a203 1
+/* Extern definitions for our privlege escalation helpers */
@


1.1.2.7
log
@2.6.20-rc compile fixes
@
text
@d12 3
a14 5
diff --git a/fs/unionfs/sioq.c b/fs/unionfs/sioq.c
new file mode 100644
index 0000000..444a3e5
--- /dev/null
+++ b/fs/unionfs/sioq.c
d64 1
a64 1
+void run_sioq(work_func_t func, struct sioq_args *args)
d66 1
a66 1
+	INIT_WORK(&args->work, func);
d69 1
a69 1
+	while (!queue_work(sioq, &args->work)) {
d76 1
a76 1
+void __unionfs_create(struct work_struct *work)
d78 1
a78 1
+	struct sioq_args *args = container_of(work, struct sioq_args, work);
d85 1
a85 1
+void __unionfs_mkdir(struct work_struct *work)
d87 1
a87 1
+	struct sioq_args *args = container_of(work, struct sioq_args, work);
d94 1
a94 1
+void __unionfs_mknod(struct work_struct *work)
d96 1
a96 1
+	struct sioq_args *args = container_of(work, struct sioq_args, work);
d103 1
a103 1
+void __unionfs_symlink(struct work_struct *work)
d105 1
a105 1
+	struct sioq_args *args = container_of(work, struct sioq_args, work);
d112 1
a112 1
+void __unionfs_unlink(struct work_struct *work)
d114 1
a114 1
+	struct sioq_args *args = container_of(work, struct sioq_args, work);
d121 2
a122 2
+void __delete_whiteouts(struct work_struct *work) {
+	struct sioq_args *args = container_of(work, struct sioq_args, work);
d129 1
a129 1
+void __is_opaque_dir(struct work_struct *work)
d131 1
a131 1
+	struct sioq_args *args = container_of(work, struct sioq_args, work);
d138 3
a140 5
diff --git a/fs/unionfs/sioq.h b/fs/unionfs/sioq.h
new file mode 100644
index 0000000..5a93414
--- /dev/null
+++ b/fs/unionfs/sioq.h
d189 1
a190 1
+	struct work_struct work;
d208 1
a208 1
+extern void run_sioq(work_func_t func, struct sioq_args *args);
d211 7
a217 7
+extern void __unionfs_create(struct work_struct *work);
+extern void __unionfs_mkdir(struct work_struct *work);
+extern void __unionfs_mknod(struct work_struct *work);
+extern void __unionfs_symlink(struct work_struct *work);
+extern void __unionfs_unlink(struct work_struct *work);
+extern void __delete_whiteouts(struct work_struct *work);
+extern void __is_opaque_dir(struct work_struct *work);
@


1.1.2.8
log
@A. Bunk's patch, more akpm comments, new copyright
@
text
@d14 1
a14 1
index 0000000..a8bc493
d19 1
a19 1
+ * Copyright (c) 2003-2007 Erez Zadok
d21 1
a21 1
+ * Copyright (c) 2005-2007 Josef 'Jeff' Sipek
d28 2
a29 2
+ * Copyright (c) 2003-2007 Stony Brook University
+ * Copyright (c) 2003-2007 The Research Foundation of State University of New York
@


