aufs: Update to aufs3.8-20130311

svn path=/dists/trunk/linux/; revision=19910

debian/changelog

@@ -1,3 +1,10 @@
+linux (3.8.2-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * aufs: Update to aufs3.8-20130311
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 10 Mar 2013 01:45:36 +0000
+
 linux (3.8.2-1~experimental.1) experimental; urgency=low
 
   * New upstream stable update:

debian/patches/features/all/aufs3/aufs3-add.patch

@@ -7493,8 +7493,8 @@
 +#endif /* __KERNEL__ */
 +#endif /* __AUFS_DYNOP_H__ */
 --- a/fs/aufs/export.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/export.c	2013-02-19 06:25:53.231644735 +0000
-@@ -0,0 +1,812 @@
++++ b/fs/aufs/export.c	2013-03-10 01:44:39.379086885 +0000
+@@ -0,0 +1,827 @@
 +/*
 + * Copyright (C) 2005-2013 Junjiro R. Okajima
 + *
@@ -7586,6 +7586,21 @@
 +	return !!(dentry->d_flags & DCACHE_DISCONNECTED);
 +}
 +
++int au_test_nfsd(void)
++{
++	int ret;
++	struct task_struct *tsk = current;
++	char comm[sizeof(tsk->comm)];
++
++	ret = 0;
++	if (tsk->flags & PF_KTHREAD) {
++		get_task_comm(comm, tsk);
++		ret = !strcmp(comm, "nfsd");
++	}
++
++	return ret;
++}
++
 +/* ---------------------------------------------------------------------- */
 +/* inode generation external table */
 +
@@ -16857,8 +16872,8 @@
 +#endif
 +#endif
 --- a/fs/aufs/loop.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/loop.c	2013-02-19 06:25:53.231644735 +0000
-@@ -0,0 +1,133 @@
++++ b/fs/aufs/loop.c	2013-03-10 01:44:39.379086885 +0000
+@@ -0,0 +1,135 @@
 +/*
 + * Copyright (C) 2005-2013 Junjiro R. Okajima
 + *
@@ -16912,12 +16927,14 @@
 +{
 +	int ret;
 +	struct task_struct *tsk = current;
++	char c, comm[sizeof(tsk->comm)];
 +
 +	ret = 0;
 +	if (tsk->flags & PF_KTHREAD) {
-+		const char c = tsk->comm[4];
++		get_task_comm(comm, tsk);
++		c = comm[4];
 +		ret = ('0' <= c && c <= '9'
-+		       && !strncmp(tsk->comm, "loop", 4));
++		       && !strncmp(comm, "loop", 4));
 +	}
 +
 +	return ret;
@@ -22039,8 +22056,8 @@
 +	.owner		= THIS_MODULE,
 +};
 --- a/fs/aufs/super.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/fs/aufs/super.h	2013-02-19 06:25:53.235644735 +0000
-@@ -0,0 +1,546 @@
++++ b/fs/aufs/super.h	2013-03-10 01:44:39.379086885 +0000
+@@ -0,0 +1,538 @@
 +/*
 + * Copyright (C) 2005-2013 Junjiro R. Okajima
 + *
@@ -22309,16 +22326,8 @@
 +/* ---------------------------------------------------------------------- */
 +
 +#ifdef CONFIG_AUFS_EXPORT
++int au_test_nfsd(void);
 +void au_export_init(struct super_block *sb);
-+
-+static inline int au_test_nfsd(void)
-+{
-+	struct task_struct *tsk = current;
-+
-+	return (tsk->flags & PF_KTHREAD)
-+		&& !strcmp(tsk->comm, "nfsd");
-+}
-+
 +void au_xigen_inc(struct inode *inode);
 +int au_xigen_new(struct inode *inode);
 +int au_xigen_set(struct super_block *sb, struct file *base);
@@ -22331,8 +22340,8 @@
 +	return -ESTALE;
 +}
 +#else
-+AuStubVoid(au_export_init, struct super_block *sb)
 +AuStubInt0(au_test_nfsd, void)
++AuStubVoid(au_export_init, struct super_block *sb)
 +AuStubVoid(au_xigen_inc, struct inode *inode)
 +AuStubInt0(au_xigen_new, struct inode *inode)
 +AuStubInt0(au_xigen_set, struct super_block *sb, struct file *base)
@@ -28610,8 +28619,8 @@
 +
 +#include <uapi/linux/aufs_type.h>
 --- a/include/uapi/linux/aufs_type.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/include/uapi/linux/aufs_type.h	2013-02-19 06:25:53.235644735 +0000
-@@ -0,0 +1,233 @@
++++ b/include/uapi/linux/aufs_type.h	2013-03-10 01:44:39.379086885 +0000
+@@ -0,0 +1,234 @@
 +/*
 + * Copyright (C) 2005-2013 Junjiro R. Okajima
 + *
@@ -28644,8 +28653,9 @@
 +#define pr_fmt(fmt)	AUFS_NAME " %s:%d: " fmt, __func__, __LINE__
 +#include <linux/sched.h>
 +#undef pr_fmt
-+#define pr_fmt(fmt)	AUFS_NAME " %s:%d:%s[%d]: " fmt, \
-+		__func__, __LINE__, current->comm, current->pid
++#define pr_fmt(fmt) \
++		AUFS_NAME " %s:%d:%.*s[%d]: " fmt, __func__, __LINE__, \
++		(int)sizeof(current->comm), current->comm, current->pid
 +#else
 +#include <stdint.h>
 +#include <sys/types.h>
@@ -28653,7 +28663,7 @@
 +
 +#include <linux/limits.h>
 +
-+#define AUFS_VERSION	"3.x-rcN-20130204"
++#define AUFS_VERSION	"3.8-20130311"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

debian/patches/features/all/aufs3/aufs3-base.patch

@@ -1,4 +1,4 @@
-aufs3.x-rcN base patch
+aufs3.8 base patch
 
 diff --git a/fs/file_table.c b/fs/file_table.c
 index de9e965..e73287a 100644

debian/patches/features/all/aufs3/aufs3-kbuild.patch

@@ -1,4 +1,4 @@
-aufs3.x-rcN kbuild patch
+aufs3.8 kbuild patch
 
 diff --git a/fs/Kconfig b/fs/Kconfig
 index 780725a..d460c05 100644

debian/patches/features/all/aufs3/aufs3-standalone.patch

@@ -1,4 +1,4 @@
-aufs3.x-rcN standalone patch
+aufs3.8 standalone patch
 
 diff --git a/fs/file_table.c b/fs/file_table.c
 index e73287a..b33aebe 100644