debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

aufs: Update to aufs3.11-20131014 

svn path=/dists/sid/linux/; revision=20734
This commit is contained in:
Ben Hutchings 2013-10-23 15:24:02 +00:00
parent 64facf96c4
commit 94f037adb9
5 changed files with 180 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -16,6 +16,7 @@ linux (3.11.6-1) UNRELEASED; urgency=low
for #717557)
* Disable CC_OPTIMIZE_FOR_SIZE (Closes: #635899, fixes FTBFS on mips,
mipsel, powerpc) [!armel/{iop32x,ixp4xx,kirkwood,orion5x},m68k]
* aufs: Update to aufs3.11-20131014
-- Ian Campbell <ijc@hellion.org.uk> Sat, 19 Oct 2013 10:34:53 +0100

293
debian/patches/features/all/aufs3/aufs3-add.patch vendored
View File

@ -1,13 +1,13 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Sep 8 00:42:31 2013 +0900
Subject: aufs3.x-rcN-20130909
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/afb98f82a779f3be9e999202fc72a0768d015004/tree/
Date: Tue Oct 8 00:19:26 2013 +0900
Subject: aufs3.11-20131014
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/b3d0ee1034d45c56bf6d545626f73452f0ee6f27/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch generated by debian/patches/features/all/aufs3/gen-patch
--- a/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/ABI/testing/debugfs-aufs 2013-06-02 18:23:34.749538984 +0100
+++ b/Documentation/ABI/testing/debugfs-aufs 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,50 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@ -60,7 +60,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ When the aufs mount option 'noxino' is specified, it
+ will be empty. About XINO files, see the aufs manual.
--- a/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/ABI/testing/sysfs-aufs 2013-09-12 03:25:05.317963426 +0100
+++ b/Documentation/ABI/testing/sysfs-aufs 2013-10-23 16:08:04.071634673 +0100
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@ -94,8 +94,8 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ When the aufs mount option 'noxino' is specified, it
+ will be empty. About XINO files, see the aufs manual.
--- a/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/README 2013-08-07 14:04:57.879008639 +0100
@@ -0,0 +1,346 @@
+++ b/Documentation/filesystems/aufs/README 2013-10-23 16:12:47.331646782 +0100
@@ -0,0 +1,347 @@
+
+Aufs3 -- advanced multi layered unification filesystem version 3.x
+http://aufs.sf.net
@ -424,7 +424,8 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+POIRETTE Marc made a donation (2013/4).
+Alessandro Gorreta made a donation (2013/4).
+lauri kasvandik made a donation (2013/5).
+pemasu from Finland made a donation (2013/7).
+"pemasu from Finland" made a donation (2013/7).
+The Parted Magic Project made a donation (2013/9).
+
+Thank you very much.
+Donations are always, including future donations, very important and
@ -443,7 +444,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+# mode: text;
+# End: ;
--- a/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/01intro.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/01intro.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,162 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -608,7 +609,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+helper, instead of doing in kernel space. Actually I am still thinking
+about it. But currently I have implemented it in kernel space.
--- a/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/02struct.txt 2013-09-11 02:43:48.425762038 +0100
+++ b/Documentation/filesystems/aufs/design/02struct.txt 2013-10-23 16:08:04.071634673 +0100
@@ -0,0 +1,243 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -854,7 +855,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+
+For this purpose, use "aumvdown" command in aufs-util.git.
--- a/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/03lookup.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/03lookup.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,106 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -963,7 +964,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ aufs performance when system surely hide the aufs branches from user,
+ by over-mounting something (or another method).
--- a/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/04branch.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/04branch.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,76 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -1042,7 +1043,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ - a regular file on the branch is opened for write and there is no
+ same named entry on the upper branch.
--- a/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/05wbr_policy.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/05wbr_policy.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,65 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -1110,7 +1111,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ one. If the selected branch is readonly, then aufs follows the
+ copyup policy.
--- a/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/06mmap.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/06mmap.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -1160,7 +1161,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+approach, aufs met a hard problem and I could not solve it without
+switching the approach.
--- a/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/07export.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/07export.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,59 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -1222,7 +1223,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+- readdir(): call lockdep_on/off() because filldir in NFSD calls
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
--- a/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/08shwh.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/08shwh.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,53 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -1278,7 +1279,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+This new squashfs archive can be stored on the boot device and the
+initramfs will use it to replace the old one at the next boot.
--- a/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/10dynop.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/10dynop.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2013 Junjiro R. Okajima
@ -1328,7 +1329,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+Currently this approach is applied to file_operations and
+vm_operations_struct for regular files only.
--- a/Documentation/filesystems/aufs/design/99plan.txt 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/design/99plan.txt 2013-03-10 01:48:58.459093058 +0000
+++ b/Documentation/filesystems/aufs/design/99plan.txt 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,96 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -1427,7 +1428,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+/new.
+Otherwise from /new.
--- a/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/Kconfig 2013-09-11 02:43:48.425762038 +0100
+++ b/fs/aufs/Kconfig 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,202 @@
+config AUFS_FS
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
@ -1632,7 +1633,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ When aufs supports Magic SysRq, enabled automatically.
+endif
--- a/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/Makefile 2013-09-11 02:43:48.425762038 +0100
+++ b/fs/aufs/Makefile 2013-10-23 16:08:04.071634673 +0100
@@ -0,0 +1,42 @@
+
+include ${src}/magic.mk
@ -1677,7 +1678,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+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 2013-03-10 01:48:58.459093058 +0000
+++ b/fs/aufs/aufs.h 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -1740,7 +1741,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_H__ */
--- a/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/branch.c 2013-09-12 03:25:05.321963426 +0100
+++ b/fs/aufs/branch.c 2013-10-23 16:08:04.071634673 +0100
@@ -0,0 +1,1212 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -2955,7 +2956,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/branch.h 2013-09-12 03:25:05.321963426 +0100
+++ b/fs/aufs/branch.h 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -3264,7 +3265,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+
+-include ${srctree}/${src}/conf_priv.mk
--- a/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/cpup.c 2013-09-12 03:25:05.321963426 +0100
+++ b/fs/aufs/cpup.c 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,1268 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -4535,7 +4536,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/cpup.h 2013-09-12 03:25:05.325963427 +0100
+++ b/fs/aufs/cpup.h 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -4633,7 +4634,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_CPUP_H__ */
--- a/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dbgaufs.c 2013-08-07 14:04:57.883008639 +0100
+++ b/fs/aufs/dbgaufs.c 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,433 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -5069,7 +5070,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dbgaufs.h 2013-03-10 01:48:58.459093058 +0000
+++ b/fs/aufs/dbgaufs.h 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -5121,7 +5122,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __DBGAUFS_H__ */
--- a/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dcsub.c 2013-09-11 02:43:44.285761939 +0100
+++ b/fs/aufs/dcsub.c 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -5367,7 +5368,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ 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 2013-03-10 01:48:58.459093058 +0000
+++ b/fs/aufs/dcsub.h 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -5464,8 +5465,8 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DCSUB_H__ */
--- a/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/debug.c 2013-09-11 02:43:48.425762038 +0100
@@ -0,0 +1,491 @@
+++ b/fs/aufs/debug.c 2013-10-23 16:12:47.331646782 +0100
@@ -0,0 +1,518 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
@ -5491,9 +5492,39 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#include <linux/vt_kern.h>
+#include "aufs.h"
+
+int aufs_debug;
+/* Returns 0, or -errno. arg is in kp->arg. */
+static int param_atomic_t_set(const char *val, const struct kernel_param *kp)
+{
+ int err, n;
+
+ err = kstrtoint(val, 0, &n);
+ if (!err) {
+ if (n > 0)
+ au_debug_on();
+ else
+ au_debug_off();
+ }
+ return err;
+}
+
+/* Returns length written or -errno. Buffer is 4k (ie. be short!) */
+static int param_atomic_t_get(char *buffer, const struct kernel_param *kp)
+{
+ atomic_t *a;
+
+ a = kp->arg;
+ return sprintf(buffer, "%d", atomic_read(a));
+}
+
+static struct kernel_param_ops param_ops_atomic_t = {
+ .set = param_atomic_t_set,
+ .get = param_atomic_t_get
+ /* void (*free)(void *arg) */
+};
+
+atomic_t aufs_debug = ATOMIC_INIT(0);
+MODULE_PARM_DESC(debug, "debug print");
+module_param_named(debug, aufs_debug, int, S_IRUGO | S_IWUSR | S_IWGRP);
+module_param_named(debug, aufs_debug, atomic_t, S_IRUGO | S_IWUSR | S_IWGRP);
+
+char *au_plevel = KERN_DEBUG;
+#define dpri(fmt, ...) do { \
@ -5846,14 +5877,11 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ continue;
+ h_inode = au_h_iptr(inode, bindex);
+ if (unlikely(h_inode != h_dentry->d_inode)) {
+ int old = au_debug_test();
+ if (!old)
+ au_debug(1);
+ au_debug_on();
+ AuDbg("b%d, %s:%d\n", bindex, func, line);
+ AuDbgDentry(dentry);
+ AuDbgInode(inode);
+ if (!old)
+ au_debug(0);
+ au_debug_off();
+ BUG();
+ }
+ }
@ -5958,8 +5986,8 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return 0;
+}
--- a/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/debug.h 2013-08-07 14:04:57.883008639 +0100
@@ -0,0 +1,242 @@
+++ b/fs/aufs/debug.h 2013-10-23 16:12:47.331646782 +0100
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
@ -5987,6 +6015,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+
+#ifdef __KERNEL__
+
+#include <linux/atomic.h>
+#include <linux/module.h>
+#include <linux/kallsyms.h>
+#include <linux/sysrq.h>
@ -5995,23 +6024,29 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#define AuDebugOn(a) BUG_ON(a)
+
+/* module parameter */
+extern int aufs_debug;
+static inline void au_debug(int n)
+extern atomic_t aufs_debug;
+static inline void au_debug_on(void)
+{
+ aufs_debug = n;
+ smp_mb();
+ atomic_inc(&aufs_debug);
+}
+static inline void au_debug_off(void)
+{
+ atomic_dec_if_positive(&aufs_debug);
+}
+
+static inline int au_debug_test(void)
+{
+ return aufs_debug;
+ return atomic_read(&aufs_debug) > 0;
+}
+#else
+#define AuDebugOn(a) do {} while (0)
+AuStubVoid(au_debug, int n)
+AuStubVoid(au_debug_on, void)
+AuStubVoid(au_debug_off, void)
+AuStubInt0(au_debug_test, void)
+#endif /* CONFIG_AUFS_DEBUG */
+
+#define param_check_atomic_t(name, p) __param_check(name, p, atomic_t)
+
+/* ---------------------------------------------------------------------- */
+
+/* debug print */
@ -6203,7 +6238,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DEBUG_H__ */
--- a/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dentry.c 2013-08-07 14:04:57.883008639 +0100
+++ b/fs/aufs/dentry.c 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,1065 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -7271,7 +7306,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ .d_release = aufs_d_release
+};
--- a/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dentry.h 2013-08-07 14:04:57.883008639 +0100
+++ b/fs/aufs/dentry.h 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -7508,7 +7543,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DENTRY_H__ */
--- a/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dinfo.c 2013-09-11 02:43:44.285761939 +0100
+++ b/fs/aufs/dinfo.c 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,543 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -8054,7 +8089,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return -1;
+}
--- a/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dir.c 2013-09-12 03:25:05.325963427 +0100
+++ b/fs/aufs/dir.c 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,645 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -8702,7 +8737,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ .fsync = aufs_fsync_dir
+};
--- a/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dir.h 2013-09-11 02:43:44.285761939 +0100
+++ b/fs/aufs/dir.h 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -8842,7 +8877,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DIR_H__ */
--- a/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/dynop.c 2013-09-11 02:43:44.285761939 +0100
+++ b/fs/aufs/dynop.c 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,380 @@
+/*
+ * Copyright (C) 2010-2013 Junjiro R. Okajima
@ -9225,7 +9260,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ 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 2013-03-10 01:48:58.459093058 +0000
+++ b/fs/aufs/dynop.h 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2010-2013 Junjiro R. Okajima
@ -9304,7 +9339,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#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-09-11 02:43:44.285761939 +0100
+++ b/fs/aufs/export.c 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,832 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -10139,7 +10174,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ 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 2013-09-12 03:25:05.325963427 +0100
+++ b/fs/aufs/f_op.c 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,721 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -10863,7 +10898,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif
+};
--- a/fs/aufs/f_op_sp.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/f_op_sp.c 2013-09-11 02:43:48.429762038 +0100
+++ b/fs/aufs/f_op_sp.c 2013-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,383 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -11249,7 +11284,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return ret;
+}
--- a/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/file.c 2013-09-12 03:25:05.325963427 +0100
+++ b/fs/aufs/file.c 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,725 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -11977,7 +12012,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* CONFIG_AUFS_DEBUG */
+};
--- a/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/file.h 2013-09-12 03:25:05.325963427 +0100
+++ b/fs/aufs/file.h 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -12292,7 +12327,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FILE_H__ */
--- a/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/finfo.c 2013-03-10 01:48:58.459093058 +0000
+++ b/fs/aufs/finfo.c 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -12452,7 +12487,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/fstype.h 2013-09-11 02:43:48.429762038 +0100
+++ b/fs/aufs/fstype.h 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,470 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -12925,7 +12960,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FSTYPE_H__ */
--- a/fs/aufs/hfsnotify.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/hfsnotify.c 2013-08-07 14:04:57.887008639 +0100
+++ b/fs/aufs/hfsnotify.c 2013-10-23 16:12:47.331646782 +0100
@@ -0,0 +1,296 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -13109,7 +13144,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ h_dir = event->to_tell;
+ h_inode = event->inode;
+#ifdef AuDbgHnotify
+ au_debug(1);
+ au_debug_on();
+ if (1 || h_child_qstr.len != sizeof(AUFS_XINO_FNAME) - 1
+ || strncmp(h_child_qstr.name, AUFS_XINO_FNAME, h_child_qstr.len)) {
+ AuDbg("i%lu, mask 0x%x %s, hcname %.*s, hi%lu\n",
@ -13117,7 +13152,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ AuLNPair(&h_child_qstr), h_inode ? h_inode->i_ino : 0);
+ /* WARN_ON(1); */
+ }
+ au_debug(0);
+ au_debug_off();
+#endif
+
+ AuDebugOn(!inode_mark);
@ -13224,7 +13259,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ .init_br = au_hfsn_init_br
+};
--- a/fs/aufs/hfsplus.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/hfsplus.c 2013-09-12 03:25:05.325963427 +0100
+++ b/fs/aufs/hfsplus.c 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2010-2013 Junjiro R. Okajima
@ -13284,7 +13319,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ }
+}
--- a/fs/aufs/hnotify.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/hnotify.c 2013-09-11 02:43:44.289761939 +0100
+++ b/fs/aufs/hnotify.c 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,712 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -13999,7 +14034,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ au_hn_destroy_cache();
+}
--- a/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/i_op.c 2013-09-12 03:25:05.325963427 +0100
+++ b/fs/aufs/i_op.c 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,1118 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -15120,7 +15155,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ .update_time = aufs_update_time
+};
--- a/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/i_op_add.c 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/i_op_add.c 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,739 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -15862,7 +15897,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/i_op_del.c 2013-09-11 02:43:48.429762038 +0100
+++ b/fs/aufs/i_op_del.c 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -16367,7 +16402,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/i_op_ren.c 2013-09-11 02:43:48.429762038 +0100
+++ b/fs/aufs/i_op_ren.c 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,1009 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -17379,7 +17414,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/iinfo.c 2013-03-10 01:48:58.463093058 +0000
+++ b/fs/aufs/iinfo.c 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -17658,7 +17693,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ AuRwDestroy(&iinfo->ii_rwsem);
+}
--- a/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/inode.c 2013-08-07 14:04:57.887008639 +0100
+++ b/fs/aufs/inode.c 2013-05-04 18:39:11.000000000 +0100
@@ -0,0 +1,492 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -18153,7 +18188,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ 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 2013-08-07 14:04:57.887008639 +0100
+++ b/fs/aufs/inode.h 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,600 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -18756,7 +18791,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_INODE_H__ */
--- a/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/ioctl.c 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/ioctl.c 2013-10-23 16:08:04.079634673 +0100
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -18961,8 +18996,8 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+}
+#endif
--- a/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/loop.c 2013-09-11 02:43:48.429762038 +0100
@@ -0,0 +1,147 @@
+++ b/fs/aufs/loop.c 2013-10-23 16:12:47.331646782 +0100
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
@ -18998,6 +19033,14 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ struct super_block *h_sb;
+ struct file *backing_file;
+
+ if (unlikely(!backing_file_func)) {
+ /* don't load "loop" module here */
+ backing_file_func = symbol_get(loop_backing_file);
+ if (unlikely(!backing_file_func))
+ /* "loop" module is not loaded */
+ return 0;
+ }
+
+ h_sb = h_adding->d_sb;
+ backing_file = backing_file_func(h_sb);
+ if (!backing_file)
@ -19087,21 +19130,12 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+
+ AuDebugOn(sizeof(sb->s_magic) != sizeof(unsigned long));
+
+ err = -ENOMEM;
+ err = 0;
+ au_warn_loopback_array = kcalloc(au_warn_loopback_step,
+ sizeof(unsigned long), GFP_NOFS);
+ if (unlikely(!au_warn_loopback_array))
+ goto out;
+ err = -ENOMEM;
+
+ err = 0;
+ backing_file_func = symbol_get(loop_backing_file);
+ if (backing_file_func)
+ goto out; /* success */
+
+ pr_err("loop_backing_file() is not defined\n");
+ err = -ENOSYS;
+ kfree(au_warn_loopback_array);
+out:
+ return err;
+}
+
@ -19111,7 +19145,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ kfree(au_warn_loopback_array);
+}
--- a/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/loop.h 2013-09-11 02:43:44.293761939 +0100
+++ b/fs/aufs/loop.h 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -19224,7 +19258,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+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 2013-08-07 14:04:57.887008639 +0100
+++ b/fs/aufs/module.c 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -19430,7 +19464,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+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 2013-03-10 01:48:58.463093058 +0000
+++ b/fs/aufs/module.h 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -19538,7 +19572,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_MODULE_H__ */
--- a/fs/aufs/mvdown.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/mvdown.c 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/mvdown.c 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,610 @@
+/*
+ * Copyright (C) 2011-2013 Junjiro R. Okajima
@ -20151,7 +20185,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/opts.c 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/opts.c 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,1704 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -21858,7 +21892,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return au_mntflags(sb) & AuOptMask_UDBA;
+}
--- a/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/opts.h 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/opts.h 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -22072,7 +22106,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_OPTS_H__ */
--- a/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/plink.c 2013-08-07 14:04:57.887008639 +0100
+++ b/fs/aufs/plink.c 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,520 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -22595,7 +22629,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ }
+}
--- a/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/poll.c 2013-03-10 01:48:58.463093058 +0000
+++ b/fs/aufs/poll.c 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -22654,7 +22688,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return mask;
+}
--- a/fs/aufs/procfs.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/procfs.c 2013-03-10 01:48:58.463093058 +0000
+++ b/fs/aufs/procfs.c 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2010-2013 Junjiro R. Okajima
@ -22827,7 +22861,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/rdu.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/rdu.c 2013-09-11 02:43:44.293761939 +0100
+++ b/fs/aufs/rdu.c 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,389 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -23219,7 +23253,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+}
+#endif
--- a/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/rwsem.h 2013-03-10 01:48:58.463093058 +0000
+++ b/fs/aufs/rwsem.h 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -23410,7 +23444,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_RWSEM_H__ */
--- a/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/sbinfo.c 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/sbinfo.c 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,350 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -23763,7 +23797,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ 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 2013-06-02 18:23:34.753538984 +0100
+++ b/fs/aufs/spl.h 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -23878,7 +23912,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SPL_H__ */
--- a/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/super.c 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/super.c 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,1002 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -24883,7 +24917,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ .owner = THIS_MODULE,
+};
--- a/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/super.h 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/super.h 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,568 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -25454,7 +25488,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SUPER_H__ */
--- a/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/sysaufs.c 2013-03-10 01:48:58.463093058 +0000
+++ b/fs/aufs/sysaufs.c 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -25562,7 +25596,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/sysaufs.h 2013-03-10 01:48:58.463093058 +0000
+++ b/fs/aufs/sysaufs.h 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -25669,7 +25703,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __SYSAUFS_H__ */
--- a/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/sysfs.c 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/sysfs.c 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -25969,7 +26003,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ }
+}
--- a/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/sysrq.c 2013-08-07 14:04:57.887008639 +0100
+++ b/fs/aufs/sysrq.c 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -26123,7 +26157,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ 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 2013-09-11 02:43:44.293761939 +0100
+++ b/fs/aufs/vdir.c 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,888 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -27014,7 +27048,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return 0;
+}
--- a/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/vfsub.c 2013-09-11 02:43:44.293761939 +0100
+++ b/fs/aufs/vfsub.c 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,772 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -27789,7 +27823,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/vfsub.h 2013-09-12 03:25:05.329963427 +0100
+++ b/fs/aufs/vfsub.h 2013-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,311 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -28103,7 +28137,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#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 2013-09-12 03:25:05.333963427 +0100
+++ b/fs/aufs/wbr_policy.c 2013-10-23 16:08:04.087634673 +0100
@@ -0,0 +1,756 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -28862,7 +28896,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ }
+};
--- a/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/whout.c 2013-08-07 14:04:57.891008639 +0100
+++ b/fs/aufs/whout.c 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,1022 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -29887,7 +29921,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ }
+}
--- a/fs/aufs/whout.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/whout.h 2013-06-02 18:23:34.753538984 +0100
+++ b/fs/aufs/whout.h 2013-06-02 18:23:34.000000000 +0100
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -29977,7 +30011,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_WHOUT_H__ */
--- a/fs/aufs/wkq.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/wkq.c 2013-09-11 02:43:48.433762038 +0100
+++ b/fs/aufs/wkq.c 2013-10-23 16:08:04.087634673 +0100
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -30193,7 +30227,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/fs/aufs/wkq.h 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/wkq.h 2013-03-10 01:48:58.463093058 +0000
+++ b/fs/aufs/wkq.h 2013-03-10 01:48:58.000000000 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -30288,8 +30322,8 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+#endif /* __KERNEL__ */
+#endif /* __AUFS_WKQ_H__ */
--- a/fs/aufs/xino.c 1970-01-01 01:00:00.000000000 +0100
+++ b/fs/aufs/xino.c 2013-09-12 03:25:05.333963427 +0100
@@ -0,0 +1,1305 @@
+++ b/fs/aufs/xino.c 2013-10-23 16:12:47.331646782 +0100
@@ -0,0 +1,1312 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
@ -30538,28 +30572,33 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ unsigned long jiffy;
+ blkcnt_t blocks;
+ aufs_bindex_t bi, bend;
+ struct kstatfs st;
+ struct kstatfs *st;
+ struct au_branch *br;
+ struct file *new_xino, *file;
+ struct super_block *h_sb;
+ struct au_xino_lock_dir ldir;
+
+ err = -ENOMEM;
+ st = kzalloc(sizeof(*st), GFP_NOFS);
+ if (unlikely(!st))
+ goto out;
+
+ err = -EINVAL;
+ bend = au_sbend(sb);
+ if (unlikely(bindex < 0 || bend < bindex))
+ goto out;
+ goto out_st;
+ br = au_sbr(sb, bindex);
+ file = br->br_xino.xi_file;
+ if (!file)
+ goto out;
+ goto out_st;
+
+ err = vfs_statfs(&file->f_path, &st);
+ err = vfs_statfs(&file->f_path, st);
+ if (unlikely(err))
+ AuErr1("statfs err %d, ignored\n", err);
+ jiffy = jiffies;
+ blocks = file_inode(file)->i_blocks;
+ pr_info("begin truncating xino(b%d), ib%llu, %llu/%llu free blks\n",
+ bindex, (u64)blocks, st.f_bfree, st.f_blocks);
+ bindex, (u64)blocks, st->f_bfree, st->f_blocks);
+
+ au_xino_lock_dir(sb, file, &ldir);
+ /* mnt_want_write() is unnecessary here */
@ -30568,7 +30607,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ err = PTR_ERR(new_xino);
+ if (IS_ERR(new_xino)) {
+ pr_err("err %d, ignored\n", err);
+ goto out;
+ goto out_st;
+ }
+ err = 0;
+ fput(file);
@ -30587,16 +30626,18 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ get_file(new_xino);
+ }
+
+ err = vfs_statfs(&new_xino->f_path, &st);
+ err = vfs_statfs(&new_xino->f_path, st);
+ if (!err) {
+ pr_info("end truncating xino(b%d), ib%llu, %llu/%llu free blks\n",
+ bindex, (u64)file_inode(new_xino)->i_blocks,
+ st.f_bfree, st.f_blocks);
+ st->f_bfree, st->f_blocks);
+ if (file_inode(new_xino)->i_blocks < blocks)
+ au_sbi(sb)->si_xino_jiffy = jiffy;
+ } else
+ AuErr1("statfs err %d, ignored\n", err);
+
+out_st:
+ kfree(st);
+out:
+ return err;
+}
@ -31596,7 +31637,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ return err;
+}
--- a/include/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
+++ b/include/linux/aufs_type.h 2013-08-07 14:04:57.891008639 +0100
+++ b/include/linux/aufs_type.h 2013-05-04 18:39:11.000000000 +0100
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2012-2013 Junjiro R. Okajima
@ -31618,7 +31659,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+
+#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-09-12 03:25:05.333963427 +0100
+++ b/include/uapi/linux/aufs_type.h 2013-10-23 16:12:47.331646782 +0100
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -31662,7 +31703,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+
+#include <linux/limits.h>
+
+#define AUFS_VERSION "3.x-rcN-20130909"
+#define AUFS_VERSION "3.11-20131014"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

8
debian/patches/features/all/aufs3/aufs3-base.patch vendored
View File

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Sep 8 00:42:31 2013 +0900
Subject: aufs3.x-rcN base patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/afb98f82a779f3be9e999202fc72a0768d015004/tree/
Date: Sat Sep 14 01:15:17 2013 +0900
Subject: aufs3.11 base patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/b3d0ee1034d45c56bf6d545626f73452f0ee6f27/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.x-rcN base patch
aufs3.11 base patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 40e7155..6e43ab0 100644

8
debian/patches/features/all/aufs3/aufs3-kbuild.patch vendored
View File

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jul 19 11:54:34 2013 +0900
Subject: aufs3.x-rcN kbuild patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/afb98f82a779f3be9e999202fc72a0768d015004/tree/
Date: Sat Sep 14 01:15:17 2013 +0900
Subject: aufs3.11 kbuild patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/b3d0ee1034d45c56bf6d545626f73452f0ee6f27/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.x-rcN kbuild patch
aufs3.11 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index c229f82..397b473 100644

8
debian/patches/features/all/aufs3/aufs3-standalone.patch vendored
View File

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Sep 8 00:42:31 2013 +0900
Subject: aufs3.x-rcN standalone patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/afb98f82a779f3be9e999202fc72a0768d015004/tree/
Date: Sat Sep 14 01:15:17 2013 +0900
Subject: aufs3.11 standalone patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/b3d0ee1034d45c56bf6d545626f73452f0ee6f27/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.x-rcN standalone patch
aufs3.11 standalone patch
diff --git a/fs/file_table.c b/fs/file_table.c
index aa91109..ab2f3c3 100644