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


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

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

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

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

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


desc
@@


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


1.1.2.1
log
@Reintroduce xattr code
@
text
@a0 295
diff -r 873e5a93c668 fs/unionfs/Makefile
--- a/fs/unionfs/Makefile	Sat Oct 07 17:40:32 2006 -0400
+++ b/fs/unionfs/Makefile	Sat Oct 07 17:40:32 2006 -0400
@@@@ -2,4 +2,5 @@@@ obj-$(CONFIG_UNION_FS) += unionfs.o
 
 unionfs-objs := subr.o dentry.o file.o inode.o main.o super.o \
 	stale_inode.o branchman.o rdstate.o copyup.o dirhelper.o \
-	rename.o unlink.o lookup.o commonfops.o dirfops.o sioq.o
+	rename.o unlink.o lookup.o commonfops.o dirfops.o sioq.o \
+	xattr.o
diff -r 873e5a93c668 fs/unionfs/copyup.c
--- a/fs/unionfs/copyup.c	Sat Oct 07 17:40:32 2006 -0400
+++ b/fs/unionfs/copyup.c	Sat Oct 07 17:40:32 2006 -0400
@@@@ -18,6 +18,72 @@@@
 
 #include "union.h"
 
+static int copyup_xattrs(struct dentry *old_hidden_dentry,
+			 struct dentry *new_hidden_dentry)
+{
+	int err = 0;
+	ssize_t list_size = -1;
+	char *name_list = NULL;
+	char *attr_value = NULL;
+	char *name_list_orig = NULL;
+
+	list_size = vfs_listxattr(old_hidden_dentry, NULL, 0);
+
+	if (list_size <= 0) {
+		err = list_size;
+		goto out;
+	}
+
+	name_list = xattr_alloc(list_size + 1, XATTR_LIST_MAX);
+	if (!name_list || IS_ERR(name_list)) {
+		err = PTR_ERR(name_list);
+		goto out;
+	}
+	list_size = vfs_listxattr(old_hidden_dentry, name_list, list_size);
+	attr_value = xattr_alloc(XATTR_SIZE_MAX, XATTR_SIZE_MAX);
+	if (!attr_value || IS_ERR(attr_value)) {
+		err = PTR_ERR(name_list);
+		goto out;
+	}
+	name_list_orig = name_list;
+	while (*name_list) {
+		ssize_t size;
+
+		//We need to lock here since vfs_getxattr doesn't lock for us.
+		mutex_lock(&old_hidden_dentry->d_inode->i_mutex);
+		size = vfs_getxattr(old_hidden_dentry, name_list,
+				    attr_value, XATTR_SIZE_MAX);
+		mutex_unlock(&old_hidden_dentry->d_inode->i_mutex);
+		if (size < 0) {
+			err = size;
+			goto out;
+		}
+
+		if (size > XATTR_SIZE_MAX) {
+			err = -E2BIG;
+			goto out;
+		}
+		//We don't need to lock here since vfs_setxattr does it for us.
+		err = vfs_setxattr(new_hidden_dentry, name_list, attr_value,
+				   size, 0);
+
+		if (err < 0)
+			goto out;
+		name_list += strlen(name_list) + 1;
+	}
+      out:
+	name_list = name_list_orig;
+
+	if (name_list)
+		xattr_free(name_list, list_size + 1);
+	if (attr_value)
+		xattr_free(attr_value, XATTR_SIZE_MAX);
+	/* It is no big deal if this fails, we just roll with the punches. */
+	if (err == -ENOTSUPP || err == -EOPNOTSUPP)
+		err = 0;
+	return err;
+}
+
 /* Determine the mode based on the copyup flags, and the existing dentry. */
 static int copyup_permissions(struct super_block *sb,
 			      struct dentry *old_hidden_dentry,
@@@@ -340,6 +406,10 @@@@ int copyup_named_dentry(struct inode *di
 	if ((err = copyup_permissions(sb, old_hidden_dentry, new_hidden_dentry)))
 		goto out_unlink;
 
+ 	/* Selinux uses extended attributes for permissions. */
+ 	if ((err = copyup_xattrs(old_hidden_dentry, new_hidden_dentry)))
+		goto out_unlink;
+
 	/* do not allow files getting deleted to be reinterposed */
 	if (!d_deleted(dentry))
 		unionfs_reinterpose(dentry);
diff -r 873e5a93c668 fs/unionfs/inode.c
--- a/fs/unionfs/inode.c	Sat Oct 07 17:40:32 2006 -0400
+++ b/fs/unionfs/inode.c	Sat Oct 07 17:40:32 2006 -0400
@@@@ -917,10 +917,18 @@@@ struct inode_operations unionfs_dir_iops
 	.rename = unionfs_rename,
 	.permission = unionfs_permission,
 	.setattr = unionfs_setattr,
+	.setxattr = unionfs_setxattr,
+	.getxattr = unionfs_getxattr,
+	.removexattr = unionfs_removexattr,
+	.listxattr = unionfs_listxattr,
 };
 
 struct inode_operations unionfs_main_iops = {
 	.permission = unionfs_permission,
 	.setattr = unionfs_setattr,
+	.setxattr = unionfs_setxattr,
+	.getxattr = unionfs_getxattr,
+	.removexattr = unionfs_removexattr,
+	.listxattr = unionfs_listxattr,
 };
 
diff -r 873e5a93c668 fs/unionfs/union.h
--- a/fs/unionfs/union.h	Sat Oct 07 17:40:32 2006 -0400
+++ b/fs/unionfs/union.h	Sat Oct 07 17:40:32 2006 -0400
@@@@ -40,6 +40,7 @@@@
 #include <linux/string.h>
 #include <linux/vmalloc.h>
 #include <linux/writeback.h>
+#include <linux/xattr.h>
 
 #include <linux/union_fs.h>
 /* the file system name */
@@@@ -317,6 +318,18 @@@@ int unionfs_ioctl_queryfile(struct file 
 /* Verify that a branch is valid. */
 int check_branch(struct nameidata *nd);
 
+/* Extended attribute functions. */
+extern void *xattr_alloc(size_t size, size_t limit);
+extern void xattr_free(void *ptr, size_t size);
+
+extern ssize_t unionfs_getxattr(struct dentry *dentry, const char *name,
+		void *value, size_t size);
+extern int unionfs_removexattr(struct dentry *dentry, const char *name);
+extern ssize_t unionfs_listxattr(struct dentry *dentry, char *list,
+		size_t size);
+extern int unionfs_setxattr(struct dentry *dentry, const char *name,
+		const void *value, size_t size, int flags);
+
 /* The root directory is unhashed, but isn't deleted. */
 static inline int d_deleted(struct dentry *d)
 {
diff -r 873e5a93c668 fs/Kconfig
--- a/fs/Kconfig	Sat Oct 07 17:40:32 2006 -0400
+++ b/fs/Kconfig	Sat Oct 07 17:44:51 2006 -0400
@@@@ -1463,6 +1463,15 @@@@ config UNION_FS
 	  their physical content separate.
 
 	  See <http://www.unionfs.org> for details
+
+config UNION_FS_XATTR
+	bool "Unionfs extended attributes"
+	depends on UNION_FS
+	help
+	  Extended attributes are name:value pairs associated with inodes by
+	  the kernel or by users (see the attr(5) manual page).
+
+	  If unsure, say N.
 
 endmenu
 
diff -r 873e5a93c668 fs/unionfs/xattr.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fs/unionfs/xattr.c	Sat Oct 07 17:40:32 2006 -0400
@@@@ -0,0 +1,123 @@@@
+/*
+ * 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"
+
+/* This is lifted from fs/xattr.c */
+void *xattr_alloc(size_t size, size_t limit)
+{
+	void *ptr;
+
+	if (size > limit)
+		return ERR_PTR(-E2BIG);
+
+	if (!size)		/* size request, no buffer is needed */
+		return NULL;
+	else if (size <= PAGE_SIZE)
+		ptr = kmalloc(size, GFP_KERNEL);
+	else
+		ptr = vmalloc(size);
+	if (!ptr)
+		return ERR_PTR(-ENOMEM);
+	return ptr;
+}
+
+void xattr_free(void *ptr, size_t size)
+{
+	if (!size)		/* size request, no buffer was needed */
+		return;
+	else if (size <= PAGE_SIZE)
+		kfree(ptr);
+	else
+		vfree(ptr);
+}
+
+/* BKL held by caller.
+ * dentry->d_inode->i_mutex locked
+ */
+ssize_t unionfs_getxattr(struct dentry * dentry, const char *name, void *value,
+		size_t size)
+{
+	struct dentry *hidden_dentry = NULL;
+	int err = -EOPNOTSUPP;
+
+	lock_dentry(dentry);
+
+	hidden_dentry = dtohd(dentry);
+
+	err = vfs_getxattr(hidden_dentry, (char*) name, value, size);
+
+	unlock_dentry(dentry);
+	return err;
+}
+
+/* BKL held by caller.
+ * dentry->d_inode->i_mutex locked
+ */
+int unionfs_setxattr(struct dentry *dentry, const char *name, const void *value,
+		 size_t size, int flags)
+{
+	struct dentry *hidden_dentry = NULL;
+	int err = -EOPNOTSUPP;
+
+	lock_dentry(dentry);
+	hidden_dentry = dtohd(dentry);
+
+	err = vfs_setxattr(hidden_dentry, (char*) name, (void*) value, size, flags);
+
+	unlock_dentry(dentry);
+	return err;
+}
+
+/* BKL held by caller.
+ * dentry->d_inode->i_mutex locked
+ */
+int unionfs_removexattr(struct dentry *dentry, const char *name)
+{
+	struct dentry *hidden_dentry = NULL;
+	int err = -EOPNOTSUPP;
+
+	lock_dentry(dentry);
+	hidden_dentry = dtohd(dentry);
+
+	err = vfs_removexattr(hidden_dentry, (char*) name);
+
+	unlock_dentry(dentry);
+	return err;
+}
+
+/* BKL held by caller.
+ * dentry->d_inode->i_mutex locked
+ */
+ssize_t unionfs_listxattr(struct dentry * dentry, char *list, size_t size)
+{
+	struct dentry *hidden_dentry = NULL;
+	int err = -EOPNOTSUPP;
+	char *encoded_list = NULL;
+
+	lock_dentry(dentry);
+
+	hidden_dentry = dtohd(dentry);
+
+	encoded_list = list;
+	err = vfs_listxattr(hidden_dentry, encoded_list, size);
+
+	unlock_dentry(dentry);
+	return err;
+}
+
@


1.1.2.2
log
@Make xattr support a configurable option
@
text
@d1 4
a4 5
diff -r 3fc3f764cd47 fs/Kconfig
--- a/fs/Kconfig	Sat Oct 07 17:47:33 2006 -0400
+++ b/fs/Kconfig	Sat Oct 07 17:47:33 2006 -0400
@@@@ -1463,6 +1463,15 @@@@ config UNION_FS
 	  their physical content separate.
d6 1
a6 21
 	  See <http://www.unionfs.org> for details
+
+config UNION_FS_XATTR
+	bool "Unionfs extended attributes"
+	depends on UNION_FS
+	help
+	  Extended attributes are name:value pairs associated with inodes by
+	  the kernel or by users (see the attr(5) manual page).
+
+	  If unsure, say N.
 
 endmenu
 
diff -r 3fc3f764cd47 fs/unionfs/Makefile
--- a/fs/unionfs/Makefile	Sat Oct 07 17:47:33 2006 -0400
+++ b/fs/unionfs/Makefile	Sat Oct 07 17:50:42 2006 -0400
@@@@ -1,5 +1,7 @@@@ obj-$(CONFIG_UNION_FS) += unionfs.o
 obj-$(CONFIG_UNION_FS) += unionfs.o
 
-unionfs-objs := subr.o dentry.o file.o inode.o main.o super.o \
+unionfs-y := subr.o dentry.o file.o inode.o main.o super.o \
d8 7
a14 7
 	rename.o unlink.o lookup.o commonfops.o dirfops.o sioq.o
+
+unionfs-$(CONFIG_UNION_FS_XATTR) += xattr.o
diff -r 3fc3f764cd47 fs/unionfs/copyup.c
--- a/fs/unionfs/copyup.c	Sat Oct 07 17:47:33 2006 -0400
+++ b/fs/unionfs/copyup.c	Sat Oct 07 17:56:08 2006 -0400
@@@@ -18,6 +18,74 @@@@
a17 1
+#ifdef CONFIG_UNION_FS_XATTR
a82 1
+#endif /* CONFIG_UNION_FS_XATTR */
d87 1
a87 1
@@@@ -340,6 +408,12 @@@@ int copyup_named_dentry(struct inode *di
a90 1
+#ifdef CONFIG_UNION_FS_XATTR
a93 1
+#endif
d98 4
a101 4
diff -r 3fc3f764cd47 fs/unionfs/inode.c
--- a/fs/unionfs/inode.c	Sat Oct 07 17:47:33 2006 -0400
+++ b/fs/unionfs/inode.c	Sat Oct 07 18:07:04 2006 -0400
@@@@ -917,10 +917,22 @@@@ struct inode_operations unionfs_dir_iops
a104 1
+#ifdef CONFIG_UNION_FS_XATTR
a108 1
+#endif
a113 1
+#ifdef CONFIG_UNION_FS_XATTR
a117 1
+#endif
d120 3
a122 3
diff -r 3fc3f764cd47 fs/unionfs/union.h
--- a/fs/unionfs/union.h	Sat Oct 07 17:47:33 2006 -0400
+++ b/fs/unionfs/union.h	Sat Oct 07 17:57:53 2006 -0400
d131 1
a131 1
@@@@ -317,6 +318,20 @@@@ int unionfs_ioctl_queryfile(struct file 
a134 1
+#ifdef CONFIG_UNION_FS_XATTR
a145 1
+#endif /* CONFIG_UNION_FS_XATTR */
d150 20
a169 1
diff -r 3fc3f764cd47 fs/unionfs/xattr.c
d171 1
a171 1
+++ b/fs/unionfs/xattr.c	Sat Oct 07 17:47:33 2006 -0400
@


1.1.2.3
log
@Line wrapping
@
text
@d1 3
a3 3
diff -r da84f022f58b fs/Kconfig
--- a/fs/Kconfig	Mon Oct 09 16:23:11 2006 -0400
+++ b/fs/Kconfig	Mon Oct 09 16:23:11 2006 -0400
d20 3
a22 3
diff -r da84f022f58b fs/unionfs/Makefile
--- a/fs/unionfs/Makefile	Mon Oct 09 16:23:11 2006 -0400
+++ b/fs/unionfs/Makefile	Mon Oct 09 16:23:11 2006 -0400
d32 3
a34 3
diff -r da84f022f58b fs/unionfs/copyup.c
--- a/fs/unionfs/copyup.c	Mon Oct 09 16:23:11 2006 -0400
+++ b/fs/unionfs/copyup.c	Mon Oct 09 16:23:11 2006 -0400
d123 3
a125 3
diff -r da84f022f58b fs/unionfs/inode.c
--- a/fs/unionfs/inode.c	Mon Oct 09 16:23:11 2006 -0400
+++ b/fs/unionfs/inode.c	Mon Oct 09 16:23:11 2006 -0400
d149 3
a151 3
diff -r da84f022f58b fs/unionfs/union.h
--- a/fs/unionfs/union.h	Mon Oct 09 16:23:11 2006 -0400
+++ b/fs/unionfs/union.h	Mon Oct 09 16:23:11 2006 -0400
d181 1
a181 1
diff -r da84f022f58b fs/unionfs/xattr.c
d183 1
a183 1
+++ b/fs/unionfs/xattr.c	Mon Oct 09 16:23:11 2006 -0400
@


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


