From 13bf7925f60d288f79fda16dde23fde66c0c8b0e Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 25 Jan 2012 04:20:39 +0000 Subject: [PATCH] aufs: Update to aufs3.2-20120109 (fixes FTBFS on m68k) svn path=/dists/trunk/linux-2.6/; revision=18630 --- debian/changelog | 1 + .../features/all/aufs3/aufs3-add.patch | 464 ++++++++---------- .../features/all/aufs3/aufs3-base.patch | 6 +- .../features/all/aufs3/aufs3-kbuild.patch | 2 +- .../features/all/aufs3/aufs3-standalone.patch | 24 +- 5 files changed, 221 insertions(+), 276 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0f6dbb67e..d3366ac8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux-2.6 (3.2.1-3) UNRELEASED; urgency=low * Remove modules.*.bin in linux-image postrm script; currently modules.builtin.bin is left behind * [alpha] Build with gcc-4.5 (Closes: #657112) + * aufs: Update to aufs3.2-20120109 (fixes FTBFS on m68k) [ Thorsten Glaser ] * [m68k] Use gcc-4.6 like (almost) all other architectures diff --git a/debian/patches/features/all/aufs3/aufs3-add.patch b/debian/patches/features/all/aufs3/aufs3-add.patch index 5c118d5ae..f4418eb31 100644 --- a/debian/patches/features/all/aufs3/aufs3-add.patch +++ b/debian/patches/features/all/aufs3/aufs3-add.patch @@ -1,5 +1,5 @@ --- a/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/Kconfig 2011-10-29 11:40:05.615788191 +0100 ++++ b/fs/aufs/Kconfig 2012-01-10 02:15:56.545455955 +0000 @@ -0,0 +1,203 @@ +config AUFS_FS + tristate "Aufs (Advanced multi layered unification filesystem) support" @@ -205,8 +205,8 @@ + When aufs supports Magic SysRq, enabled automatically. +endif --- a/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/Makefile 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,38 @@ ++++ b/fs/aufs/Makefile 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,42 @@ + +include ${src}/magic.mk +ifeq (${CONFIG_AUFS_FS},m) @@ -217,8 +217,12 @@ +# cf. include/linux/kernel.h +# enable pr_debug +ccflags-y += -DDEBUG -+# sparse doesn't allow spaces -+ccflags-y += -D'pr_fmt(fmt)=AUFS_NAME"\040%s:%d:%s[%d]:\040"fmt,__func__,__LINE__,current->comm,current->pid' ++# sparse requires the full pathname ++ifdef M ++ccflags-y += -include ${M}/../../include/linux/aufs_type.h ++else ++ccflags-y += -include ${srctree}/include/linux/aufs_type.h ++endif + +obj-$(CONFIG_AUFS_FS) += aufs.o +aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o \ @@ -246,10 +250,10 @@ +aufs-$(CONFIG_AUFS_DEBUG) += debug.o +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o --- a/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/aufs.h 2011-10-29 11:40:05.615788191 +0100 ++++ b/fs/aufs/aufs.h 2012-01-10 02:15:56.545455955 +0000 @@ -0,0 +1,60 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -309,10 +313,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_H__ */ --- a/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/branch.c 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,1170 @@ ++++ b/fs/aufs/branch.c 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,1169 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -334,7 +338,6 @@ + */ + +#include -+#include +#include +#include "aufs.h" + @@ -1482,10 +1485,10 @@ + return err; +} --- a/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/branch.h 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,232 @@ ++++ b/fs/aufs/branch.h 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,230 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -1511,9 +1514,7 @@ + +#ifdef __KERNEL__ + -+#include +#include -+#include +#include "dynop.h" +#include "rwsem.h" +#include "super.h" @@ -1717,7 +1718,7 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_BRANCH_H__ */ --- a/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/conf.mk 2011-10-29 11:40:05.615788191 +0100 ++++ b/fs/aufs/conf.mk 2012-01-10 02:15:56.545455955 +0000 @@ -0,0 +1,38 @@ + +AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS} @@ -1758,10 +1759,10 @@ + +-include ${srctree}/${src}/conf_priv.mk --- a/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/cpup.c 2011-11-19 23:25:01.975822834 +0000 -@@ -0,0 +1,1081 @@ ++++ b/fs/aufs/cpup.c 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,1079 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -1782,10 +1783,8 @@ + * copy-up functions, see wbr_policy.c for copy-down + */ + -+#include +#include +#include -+#include +#include "aufs.h" + +void au_cpup_attr_flags(struct inode *dst, struct inode *src) @@ -2842,10 +2841,10 @@ + return err; +} --- a/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/cpup.h 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,83 @@ ++++ b/fs/aufs/cpup.h 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,81 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -2872,8 +2871,6 @@ +#ifdef __KERNEL__ + +#include -+#include -+#include + +struct inode; +struct file; @@ -2928,10 +2925,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_CPUP_H__ */ --- a/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dbgaufs.c 2011-11-19 23:25:01.975822834 +0000 ++++ b/fs/aufs/dbgaufs.c 2012-01-10 02:15:56.545455955 +0000 @@ -0,0 +1,334 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -3265,10 +3262,10 @@ + return err; +} --- a/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dbgaufs.h 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,52 @@ ++++ b/fs/aufs/dbgaufs.h 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,49 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -3294,9 +3291,6 @@ + +#ifdef __KERNEL__ + -+#include -+#include -+ +struct super_block; +struct au_sbinfo; + @@ -3320,10 +3314,10 @@ +#endif /* __KERNEL__ */ +#endif /* __DBGAUFS_H__ */ --- a/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dcsub.c 2011-10-29 11:40:05.615788191 +0100 ++++ b/fs/aufs/dcsub.c 2012-01-10 02:15:56.545455955 +0000 @@ -0,0 +1,243 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -3566,10 +3560,10 @@ + return path_is_under(path + 0, path + 1); +} --- a/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dcsub.h 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,95 @@ ++++ b/fs/aufs/dcsub.h 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,94 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -3597,7 +3591,6 @@ + +#include +#include -+#include + +struct dentry; + @@ -3664,10 +3657,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_DCSUB_H__ */ --- a/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/debug.c 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,490 @@ ++++ b/fs/aufs/debug.c 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,489 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -3688,7 +3681,6 @@ + * debug print functions + */ + -+#include +#include +#include "aufs.h" + @@ -4157,10 +4149,10 @@ + return 0; +} --- a/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/debug.h 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,252 @@ ++++ b/fs/aufs/debug.h 2012-01-10 02:15:56.545455955 +0000 +@@ -0,0 +1,243 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -4187,18 +4179,9 @@ +#ifdef __KERNEL__ + +#include -+#include -+/* #include */ -+#include +#include +#include -+/* #include */ -+#include -+/* #include */ +#include -+#include -+ -+#include + +#ifdef CONFIG_AUFS_DEBUG +#define AuDebugOn(a) BUG_ON(a) @@ -4412,10 +4395,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_DEBUG_H__ */ --- a/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dentry.c 2011-10-29 11:40:05.615788191 +0100 ++++ b/fs/aufs/dentry.c 2012-01-10 02:15:56.545455955 +0000 @@ -0,0 +1,1140 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -5555,10 +5538,10 @@ + .d_release = aufs_d_release +}; --- a/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dentry.h 2011-10-29 11:40:05.615788191 +0100 -@@ -0,0 +1,238 @@ ++++ b/fs/aufs/dentry.h 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,237 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -5585,7 +5568,6 @@ +#ifdef __KERNEL__ + +#include -+#include +#include "rwsem.h" + +struct au_hdentry { @@ -5796,10 +5778,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_DENTRY_H__ */ --- a/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dinfo.c 2011-10-29 11:40:05.615788191 +0100 ++++ b/fs/aufs/dinfo.c 2012-01-10 02:15:56.549455982 +0000 @@ -0,0 +1,543 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -6342,10 +6324,10 @@ + return -1; +} --- a/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dir.c 2011-11-19 23:25:01.975822834 +0000 -@@ -0,0 +1,635 @@ ++++ b/fs/aufs/dir.c 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,634 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -6366,7 +6348,6 @@ + * directory operations + */ + -+#include +#include +#include "aufs.h" + @@ -6980,10 +6961,10 @@ + .fsync = aufs_fsync_dir +}; --- a/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dir.h 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,138 @@ ++++ b/fs/aufs/dir.h 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,137 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -7010,7 +6991,6 @@ +#ifdef __KERNEL__ + +#include -+#include + +/* ---------------------------------------------------------------------- */ + @@ -7121,10 +7101,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_DIR_H__ */ --- a/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dynop.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/dynop.c 2012-01-10 02:15:56.549455982 +0000 @@ -0,0 +1,377 @@ +/* -+ * Copyright (C) 2010-2011 Junjiro R. Okajima ++ * Copyright (C) 2010-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -7501,10 +7481,10 @@ + WARN_ON(!list_empty(&dynop[i].head)); +} --- a/fs/aufs/dynop.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/dynop.h 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,80 @@ ++++ b/fs/aufs/dynop.h 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,76 @@ +/* -+ * Copyright (C) 2010-2011 Junjiro R. Okajima ++ * Copyright (C) 2010-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -7530,10 +7510,6 @@ + +#ifdef __KERNEL__ + -+#include -+#include -+#include -+#include +#include "inode.h" + +enum {AuDy_AOP, AuDyLast}; @@ -7584,10 +7560,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_DYNOP_H__ */ --- a/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/export.c 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,805 @@ ++++ b/fs/aufs/export.c 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,804 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -7609,7 +7585,6 @@ + */ + +#include -+#include +#include +#include +#include @@ -8392,10 +8367,10 @@ + atomic_set(&sbinfo->si_xigen_next, u); +} --- a/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/f_op.c 2011-11-19 23:25:01.975822834 +0000 -@@ -0,0 +1,731 @@ ++++ b/fs/aufs/f_op.c 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,729 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -8416,10 +8391,8 @@ + * file and vm operations + */ + -+#include +#include +#include -+#include +#include +#include "aufs.h" + @@ -9126,10 +9099,10 @@ +#endif +}; --- a/fs/aufs/f_op_sp.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/f_op_sp.c 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,299 @@ ++++ b/fs/aufs/f_op_sp.c 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,298 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -9152,7 +9125,6 @@ + * their file I/O is handled out of aufs. + */ + -+#include +#include "aufs.h" + +static ssize_t aufs_aio_read_sp(struct kiocb *kio, const struct iovec *iov, @@ -9428,10 +9400,10 @@ + return ret; +} --- a/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/file.c 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,676 @@ ++++ b/fs/aufs/file.c 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,673 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -9452,9 +9424,6 @@ + * handling file/dir, and address_space operation + */ + -+#include -+#include -+#include +#include +#include "aufs.h" + @@ -10107,10 +10076,10 @@ +#endif /* CONFIG_AUFS_DEBUG */ +}; --- a/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/file.h 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,299 @@ ++++ b/fs/aufs/file.h 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,298 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -10139,7 +10108,6 @@ +#include +#include +#include -+#include +#include "rwsem.h" + +struct au_branch; @@ -10409,10 +10377,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_FILE_H__ */ --- a/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/finfo.c 2011-11-19 23:25:01.975822834 +0000 -@@ -0,0 +1,157 @@ ++++ b/fs/aufs/finfo.c 2012-01-10 02:15:56.549455982 +0000 +@@ -0,0 +1,156 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -10433,7 +10401,6 @@ + * file private data + */ + -+#include +#include "aufs.h" + +void au_hfput(struct au_hfile *hf, struct file *file) @@ -10569,10 +10536,10 @@ + return err; +} --- a/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/fstype.h 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,497 @@ ++++ b/fs/aufs/fstype.h 2012-01-10 02:15:56.553455997 +0000 +@@ -0,0 +1,496 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -10601,7 +10568,6 @@ +#include +#include +#include -+#include + +static inline int au_test_aufs(struct super_block *sb) +{ @@ -11069,10 +11035,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_FSTYPE_H__ */ --- a/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/hfsnotify.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/hfsnotify.c 2012-01-10 02:15:56.553455997 +0000 @@ -0,0 +1,247 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -11319,10 +11285,10 @@ + .init_br = au_hfsn_init_br +}; --- a/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/hfsplus.c 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,58 @@ ++++ b/fs/aufs/hfsplus.c 2012-01-10 02:15:56.553455997 +0000 +@@ -0,0 +1,57 @@ +/* -+ * Copyright (C) 2010-2011 Junjiro R. Okajima ++ * Copyright (C) 2010-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -11349,7 +11315,6 @@ + * and au_h_open_post() after releasing it. + */ + -+#include +#include "aufs.h" + +struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex) @@ -11380,10 +11345,10 @@ + } +} --- a/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/hnotify.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/hnotify.c 2012-01-10 02:15:56.553455997 +0000 @@ -0,0 +1,712 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -12095,10 +12060,10 @@ + au_hn_destroy_cache(); +} --- a/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/i_op.c 2011-11-19 23:25:01.975822834 +0000 -@@ -0,0 +1,994 @@ ++++ b/fs/aufs/i_op.c 2012-01-10 02:15:56.553455997 +0000 +@@ -0,0 +1,992 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -12121,10 +12086,8 @@ + +#include +#include -+#include +#include +#include -+#include +#include "aufs.h" + +static int h_permission(struct inode *h_inode, int mask, @@ -13092,10 +13055,10 @@ + .truncate_range = aufs_truncate_range +}; --- a/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/i_op_add.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/i_op_add.c 2012-01-10 02:15:56.553455997 +0000 @@ -0,0 +1,711 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -13806,10 +13769,10 @@ + return err; +} --- a/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/i_op_del.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/i_op_del.c 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,478 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -14287,10 +14250,10 @@ + return err; +} --- a/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/i_op_ren.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/i_op_ren.c 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,1017 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -15307,10 +15270,10 @@ + return err; +} --- a/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/iinfo.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/iinfo.c 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,264 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -15574,10 +15537,10 @@ + AuRwDestroy(&iinfo->ii_rwsem); +} --- a/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/inode.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/inode.c 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,471 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -16048,10 +16011,10 @@ + return au_test_h_perm(h_inode, mask); +} --- a/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/inode.h 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,556 @@ ++++ b/fs/aufs/inode.h 2012-01-10 02:15:56.557456016 +0000 +@@ -0,0 +1,554 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -16077,9 +16040,7 @@ + +#ifdef __KERNEL__ + -+#include +#include -+#include +#include "rwsem.h" + +struct vfsmount; @@ -16607,10 +16568,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_INODE_H__ */ --- a/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/ioctl.c 2011-10-29 11:40:05.619788223 +0100 -@@ -0,0 +1,197 @@ ++++ b/fs/aufs/ioctl.c 2012-01-10 02:15:56.557456016 +0000 +@@ -0,0 +1,196 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -16633,7 +16594,6 @@ + * assist the pathconf(3) wrapper library. + */ + -+#include +#include "aufs.h" + +static int au_wbr_fd(struct path *path, struct aufs_wbr_fd __user *arg) @@ -16807,10 +16767,10 @@ +#endif +#endif --- a/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/loop.c 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/loop.c 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,133 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -16943,10 +16903,10 @@ + kfree(au_warn_loopback_array); +} --- a/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/loop.h 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/loop.h 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,50 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -16996,7 +16956,7 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_LOOP_H__ */ --- a/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/magic.mk 2011-10-29 11:40:05.619788223 +0100 ++++ b/fs/aufs/magic.mk 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,54 @@ + +# defined in ${srctree}/fs/fuse/inode.c @@ -17053,10 +17013,10 @@ +ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b +endif --- a/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/module.c 2011-11-19 23:25:01.975822834 +0000 ++++ b/fs/aufs/module.c 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,195 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -17251,10 +17211,10 @@ +module_init(aufs_init); +module_exit(aufs_exit); --- a/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/module.h 2011-11-19 23:25:01.975822834 +0000 ++++ b/fs/aufs/module.h 2012-01-10 02:15:56.557456016 +0000 @@ -0,0 +1,107 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -17361,10 +17321,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_MODULE_H__ */ --- a/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/opts.c 2011-11-19 23:25:01.979822863 +0000 -@@ -0,0 +1,1679 @@ ++++ b/fs/aufs/opts.c 2012-01-10 02:15:56.561456041 +0000 +@@ -0,0 +1,1677 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -17385,8 +17345,6 @@ + * mount options/flags + */ + -+#include -+#include +#include +#include /* a distribution requires */ +#include @@ -19043,10 +19001,10 @@ + return au_mntflags(sb) & AuOptMask_UDBA; +} --- a/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/opts.h 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,210 @@ ++++ b/fs/aufs/opts.h 2012-01-10 02:15:56.561456041 +0000 +@@ -0,0 +1,209 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -19073,7 +19031,6 @@ +#ifdef __KERNEL__ + +#include -+#include + +struct file; +struct super_block; @@ -19256,10 +19213,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_OPTS_H__ */ --- a/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/plink.c 2011-10-29 11:40:05.623788233 +0100 ++++ b/fs/aufs/plink.c 2012-01-10 02:15:56.561456041 +0000 @@ -0,0 +1,515 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -19774,10 +19731,10 @@ + } +} --- a/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/poll.c 2011-10-29 11:40:05.623788233 +0100 ++++ b/fs/aufs/poll.c 2012-01-10 02:15:56.561456041 +0000 @@ -0,0 +1,56 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -19833,10 +19790,10 @@ + return mask; +} --- a/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/procfs.c 2011-11-19 23:25:01.979822863 +0000 ++++ b/fs/aufs/procfs.c 2012-01-10 02:15:56.561456041 +0000 @@ -0,0 +1,170 @@ +/* -+ * Copyright (C) 2010-2011 Junjiro R. Okajima ++ * Copyright (C) 2010-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -20006,10 +19963,10 @@ + return err; +} --- a/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/rdu.c 2011-11-19 23:25:01.979822863 +0000 -@@ -0,0 +1,385 @@ ++++ b/fs/aufs/rdu.c 2012-01-10 02:15:56.561456041 +0000 +@@ -0,0 +1,383 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -20033,8 +19990,6 @@ +#include +#include +#include -+#include -+#include +#include "aufs.h" + +/* bits for struct aufs_rdu.flags */ @@ -20394,10 +20349,10 @@ +} +#endif --- a/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/rwsem.h 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,189 @@ ++++ b/fs/aufs/rwsem.h 2012-01-10 02:15:56.561456041 +0000 +@@ -0,0 +1,188 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -20423,7 +20378,6 @@ + +#ifdef __KERNEL__ + -+#include +#include "debug.h" + +struct au_rwsem { @@ -20586,10 +20540,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_RWSEM_H__ */ --- a/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/sbinfo.c 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,344 @@ ++++ b/fs/aufs/sbinfo.c 2012-01-10 02:15:56.561456041 +0000 +@@ -0,0 +1,343 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -20610,7 +20564,6 @@ + * superblock private data + */ + -+#include +#include "aufs.h" + +/* @@ -20933,10 +20886,10 @@ + spin_unlock(&sbinfo->au_si_pid.tree_lock); +} --- a/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/spl.h 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,66 @@ ++++ b/fs/aufs/spl.h 2012-01-10 02:15:56.561456041 +0000 +@@ -0,0 +1,62 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -20962,10 +20915,6 @@ + +#ifdef __KERNEL__ + -+#include -+#include -+#include -+ +struct au_splhead { + spinlock_t spin; + struct list_head head; @@ -21002,10 +20951,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_SPL_H__ */ --- a/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/super.c 2011-11-19 23:25:01.979822863 +0000 -@@ -0,0 +1,939 @@ ++++ b/fs/aufs/super.c 2012-01-10 02:15:56.569456073 +0000 +@@ -0,0 +1,938 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -21026,8 +20975,7 @@ + * mount and super_block operations + */ + -+#include -+#include ++#include +#include +#include +#include @@ -21944,10 +21892,10 @@ + .owner = THIS_MODULE, +}; --- a/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/super.h 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,547 @@ ++++ b/fs/aufs/super.h 2012-01-10 02:15:56.569456073 +0000 +@@ -0,0 +1,546 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -21974,7 +21922,6 @@ +#ifdef __KERNEL__ + +#include -+#include +#include "rwsem.h" +#include "spl.h" +#include "wkq.h" @@ -22494,10 +22441,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_SUPER_H__ */ --- a/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/sysaufs.c 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,107 @@ ++++ b/fs/aufs/sysaufs.c 2012-01-10 02:15:56.569456073 +0000 +@@ -0,0 +1,105 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -22519,9 +22466,7 @@ + * they are necessary regardless sysfs is disabled. + */ + -+#include +#include -+#include +#include "aufs.h" + +unsigned long sysaufs_si_mask; @@ -22604,10 +22549,10 @@ + return err; +} --- a/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/sysaufs.h 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,105 @@ ++++ b/fs/aufs/sysaufs.h 2012-01-10 02:15:56.569456073 +0000 +@@ -0,0 +1,104 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -22634,7 +22579,6 @@ +#ifdef __KERNEL__ + +#include -+#include +#include "module.h" + +struct super_block; @@ -22712,10 +22656,10 @@ +#endif /* __KERNEL__ */ +#endif /* __SYSAUFS_H__ */ --- a/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/sysfs.c 2011-11-19 23:25:01.979822863 +0000 -@@ -0,0 +1,260 @@ ++++ b/fs/aufs/sysfs.c 2012-01-10 02:15:56.569456073 +0000 +@@ -0,0 +1,257 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -22736,10 +22680,7 @@ + * sysfs interface + */ + -+#include -+#include +#include -+#include +#include "aufs.h" + +#ifdef CONFIG_AUFS_FS_MODULE @@ -22975,10 +22916,10 @@ + } +} --- a/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/sysrq.c 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,151 @@ ++++ b/fs/aufs/sysrq.c 2012-01-10 02:15:56.569456073 +0000 +@@ -0,0 +1,148 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -22999,9 +22940,6 @@ + * magic sysrq hanlder + */ + -+#include -+#include -+#include +/* #include */ +#include +#include "aufs.h" @@ -23129,10 +23067,10 @@ + pr_err("err %d (ignored)\n", err); +} --- a/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/vdir.c 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,886 @@ ++++ b/fs/aufs/vdir.c 2012-01-10 02:15:56.569456073 +0000 +@@ -0,0 +1,885 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -23153,7 +23091,6 @@ + * virtual or vertical directory + */ + -+#include +#include "aufs.h" + +static unsigned int calc_size(int nlen) @@ -24018,10 +23955,10 @@ + return 0; +} --- a/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/vfsub.c 2011-11-19 23:25:01.979822863 +0000 -@@ -0,0 +1,837 @@ ++++ b/fs/aufs/vfsub.c 2012-01-10 02:15:56.569456073 +0000 +@@ -0,0 +1,835 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -24042,12 +23979,10 @@ + * sub-routines for VFS + */ + -+#include +#include +#include +#include +#include -+#include +#include "aufs.h" + +int vfsub_update_h_iattr(struct path *h_path, int *did) @@ -24858,10 +24793,10 @@ + return err; +} --- a/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/vfsub.h 2011-10-29 11:40:05.623788233 +0100 ++++ b/fs/aufs/vfsub.h 2012-01-10 02:15:56.569456073 +0000 @@ -0,0 +1,232 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -25093,10 +25028,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_VFSUB_H__ */ --- a/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/wbr_policy.c 2011-10-29 11:40:05.623788233 +0100 ++++ b/fs/aufs/wbr_policy.c 2012-01-10 02:15:56.569456073 +0000 @@ -0,0 +1,700 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -25796,10 +25731,10 @@ + } +}; --- a/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/whout.c 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,1050 @@ ++++ b/fs/aufs/whout.c 2012-01-10 02:15:56.573456100 +0000 +@@ -0,0 +1,1049 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -25820,7 +25755,6 @@ + * whiteout for logical deletion and opaque directory + */ + -+#include +#include "aufs.h" + +#define WH_MASK S_IRUGO @@ -26849,10 +26783,10 @@ + } +} --- a/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/whout.h 2011-10-29 11:40:05.623788233 +0100 -@@ -0,0 +1,89 @@ ++++ b/fs/aufs/whout.h 2012-01-10 02:15:56.573456100 +0000 +@@ -0,0 +1,88 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -26878,7 +26812,6 @@ + +#ifdef __KERNEL__ + -+#include +#include "dir.h" + +/* whout.c */ @@ -26941,10 +26874,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_WHOUT_H__ */ --- a/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/wkq.c 2011-11-19 23:25:01.979822863 +0000 ++++ b/fs/aufs/wkq.c 2012-01-10 02:15:56.573456100 +0000 @@ -0,0 +1,214 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -27158,10 +27091,10 @@ + return err; +} --- a/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/wkq.h 2011-11-19 23:25:01.979822863 +0000 -@@ -0,0 +1,96 @@ ++++ b/fs/aufs/wkq.h 2012-01-10 02:15:56.573456100 +0000 +@@ -0,0 +1,92 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -27188,10 +27121,6 @@ + +#ifdef __KERNEL__ + -+#include -+#include -+#include -+ +struct super_block; + +/* ---------------------------------------------------------------------- */ @@ -27257,10 +27186,10 @@ +#endif /* __KERNEL__ */ +#endif /* __AUFS_WKQ_H__ */ --- a/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/fs/aufs/xino.c 2011-11-19 23:25:01.979822863 +0000 -@@ -0,0 +1,1266 @@ ++++ b/fs/aufs/xino.c 2012-01-10 02:15:56.573456100 +0000 +@@ -0,0 +1,1264 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -27281,9 +27210,7 @@ + * external inode number translation table and bitmap + */ + -+#include +#include -+#include +#include "aufs.h" + +/* todo: unnecessary to support mmap_sem since kernel-space? */ @@ -28526,10 +28453,10 @@ + return err; +} --- a/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/linux/aufs_type.h 2011-11-19 23:25:01.979822863 +0000 -@@ -0,0 +1,224 @@ ++++ b/include/linux/aufs_type.h 2012-01-10 02:15:56.573456100 +0000 +@@ -0,0 +1,233 @@ +/* -+ * Copyright (C) 2005-2011 Junjiro R. Okajima ++ * Copyright (C) 2005-2012 Junjiro R. Okajima + * + * This program, aufs is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by @@ -28549,17 +28476,27 @@ +#ifndef __AUFS_TYPE_H__ +#define __AUFS_TYPE_H__ + -+#include -+#include -+#include ++#define AUFS_NAME "aufs" ++ +#ifdef __KERNEL__ -+#include ++/* ++ * define it before including all other headers. ++ * sched.h may use pr_* macros before defining "current", so define the ++ * no-current version first, and re-define later. ++ */ ++#define pr_fmt(fmt) AUFS_NAME " %s:%d: " fmt, __func__, __LINE__ ++#include ++#undef pr_fmt ++#define pr_fmt(fmt) AUFS_NAME " %s:%d:%s[%d]: " fmt, \ ++ __func__, __LINE__, current->comm, current->pid +#else +#include +#include -+#endif ++#endif /* __KERNEL__ */ + -+#define AUFS_VERSION "3.x-rcN-20111114" ++#include ++ ++#define AUFS_VERSION "3.2-20120109" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') @@ -28588,7 +28525,6 @@ + +/* ---------------------------------------------------------------------- */ + -+#define AUFS_NAME "aufs" +#define AUFS_FSTYPE AUFS_NAME + +#define AUFS_ROOT_INO 2 diff --git a/debian/patches/features/all/aufs3/aufs3-base.patch b/debian/patches/features/all/aufs3/aufs3-base.patch index 8d94f4fed..ac30c8db9 100644 --- a/debian/patches/features/all/aufs3/aufs3-base.patch +++ b/debian/patches/features/all/aufs3/aufs3-base.patch @@ -1,10 +1,10 @@ -aufs3.x-rcN base patch +aufs3.2 base patch diff --git a/fs/namei.c b/fs/namei.c -index ac6d214..f72b667 100644 +index 5008f01..4cc94cf 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1750,7 +1750,7 @@ static struct dentry *__lookup_hash(struct qstr *name, +@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name, * needs parent already locked. Doesn't follow mounts. * SMP-safe. */ diff --git a/debian/patches/features/all/aufs3/aufs3-kbuild.patch b/debian/patches/features/all/aufs3/aufs3-kbuild.patch index 240d5bdbb..fc0a50bf5 100644 --- a/debian/patches/features/all/aufs3/aufs3-kbuild.patch +++ b/debian/patches/features/all/aufs3/aufs3-kbuild.patch @@ -1,4 +1,4 @@ -aufs3.x-rcN kbuild patch +aufs3.2 kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig index 5f4c45d..357a8a6 100644 diff --git a/debian/patches/features/all/aufs3/aufs3-standalone.patch b/debian/patches/features/all/aufs3/aufs3-standalone.patch index f519d502a..460b5355e 100644 --- a/debian/patches/features/all/aufs3/aufs3-standalone.patch +++ b/debian/patches/features/all/aufs3/aufs3-standalone.patch @@ -1,4 +1,4 @@ -aufs3.x-rcN standalone patch +aufs3.2 standalone patch diff --git a/fs/file_table.c b/fs/file_table.c index c322794..2aad244 100644 @@ -26,10 +26,10 @@ index ee4e66b..728042b 100644 /* * Empty aops. Can be used for the cases where the user does not diff --git a/fs/namei.c b/fs/namei.c -index f72b667..7a58222 100644 +index 4cc94cf..af19e30 100644 --- a/fs/namei.c +++ b/fs/namei.c -@@ -1754,6 +1754,7 @@ struct dentry *lookup_hash(struct nameidata *nd) +@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd) { return __lookup_hash(&nd->last, nd->path.dentry, nd); } @@ -38,10 +38,10 @@ index f72b667..7a58222 100644 /** * lookup_one_len - filesystem helper to lookup single pathname component diff --git a/fs/namespace.c b/fs/namespace.c -index e5e1c7d..344999b 100644 +index cfc6d44..173d15a 100644 --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1509,6 +1509,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, +@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, } return 0; } @@ -152,10 +152,18 @@ index ee4f848..611fd70 100644 } +EXPORT_SYMBOL_GPL(cap_file_mmap); diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 4450fbe..2c437e5 100644 +index 4450fbe..bc94175 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c -@@ -500,6 +500,7 @@ found: +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -500,6 +501,7 @@ found: return -EPERM; } @@ -164,7 +172,7 @@ index 4450fbe..2c437e5 100644 int devcgroup_inode_mknod(int mode, dev_t dev) { diff --git a/security/security.c b/security/security.c -index 0c6cc69..d58ba1b 100644 +index e2f684a..892000c 100644 --- a/security/security.c +++ b/security/security.c @@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)