summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-11-15 23:07:47 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-11-15 23:07:47 +0100
commitb83c514e2e2c0b1706a17c504307d806e159647d (patch)
tree29172ba7094f6f4cfa08f6531f0bab52ffb42ad1 /target/linux
parente2502ab7b4adfc6b09c273a2f5487d8a0ed559bf (diff)
update asterisk, fix aufs2 compile
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/patches/2.6.31.5/aufs2.patch454
1 files changed, 228 insertions, 226 deletions
diff --git a/target/linux/patches/2.6.31.5/aufs2.patch b/target/linux/patches/2.6.31.5/aufs2.patch
index 7a6d3bac6..6c40cfb81 100644
--- a/target/linux/patches/2.6.31.5/aufs2.patch
+++ b/target/linux/patches/2.6.31.5/aufs2.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.31.4/Documentation/ABI/testing/debugfs-aufs
---- linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/Documentation/ABI/testing/debugfs-aufs 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.31.5/Documentation/ABI/testing/debugfs-aufs
+--- linux-2.6.31.5.orig/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/Documentation/ABI/testing/debugfs-aufs 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,40 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -42,9 +42,9 @@ diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/debugfs-aufs linux-2.6.3
+ When the aufs mount option 'noxino' is specified, it
+ will be empty. About XINO files, see
+ Documentation/filesystems/aufs/aufs.5 in detail.
-diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31.4/Documentation/ABI/testing/sysfs-aufs
---- linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/Documentation/ABI/testing/sysfs-aufs 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31.5/Documentation/ABI/testing/sysfs-aufs
+--- linux-2.6.31.5.orig/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/Documentation/ABI/testing/sysfs-aufs 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,25 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -71,9 +71,9 @@ diff -Nur linux-2.6.31.4.orig/Documentation/ABI/testing/sysfs-aufs linux-2.6.31.
+ When the aufs mount option 'noxino' is specified, it
+ will be empty. About XINO files, see
+ Documentation/filesystems/aufs/aufs.5 in detail.
-diff -Nur linux-2.6.31.4.orig/fs/aufs/aufs.h linux-2.6.31.4/fs/aufs/aufs.h
---- linux-2.6.31.4.orig/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/aufs.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/aufs.h linux-2.6.31.5/fs/aufs/aufs.h
+--- linux-2.6.31.5.orig/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/aufs.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -126,9 +126,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/aufs.h linux-2.6.31.4/fs/aufs/aufs.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.c linux-2.6.31.4/fs/aufs/branch.c
---- linux-2.6.31.4.orig/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/branch.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/branch.c linux-2.6.31.5/fs/aufs/branch.c
+--- linux-2.6.31.5.orig/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/branch.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,974 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -1104,9 +1104,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.c linux-2.6.31.4/fs/aufs/branch.c
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.h linux-2.6.31.4/fs/aufs/branch.h
---- linux-2.6.31.4.orig/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/branch.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/branch.h linux-2.6.31.5/fs/aufs/branch.h
+--- linux-2.6.31.5.orig/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/branch.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -1327,9 +1327,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/branch.h linux-2.6.31.4/fs/aufs/branch.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_BRANCH_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.c linux-2.6.31.4/fs/aufs/cpup.c
---- linux-2.6.31.4.orig/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/cpup.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/cpup.c linux-2.6.31.5/fs/aufs/cpup.c
+--- linux-2.6.31.5.orig/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/cpup.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,1048 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -2379,9 +2379,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.c linux-2.6.31.4/fs/aufs/cpup.c
+ dput(parent);
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.h linux-2.6.31.4/fs/aufs/cpup.h
---- linux-2.6.31.4.orig/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/cpup.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/cpup.h linux-2.6.31.5/fs/aufs/cpup.h
+--- linux-2.6.31.5.orig/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/cpup.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -2464,9 +2464,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/cpup.h linux-2.6.31.4/fs/aufs/cpup.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_CPUP_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.c linux-2.6.31.4/fs/aufs/dbgaufs.c
---- linux-2.6.31.4.orig/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dbgaufs.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dbgaufs.c linux-2.6.31.5/fs/aufs/dbgaufs.c
+--- linux-2.6.31.5.orig/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dbgaufs.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,331 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -2799,9 +2799,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.c linux-2.6.31.4/fs/aufs/dbgaufs.c
+ err = 0;
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.h linux-2.6.31.4/fs/aufs/dbgaufs.h
---- linux-2.6.31.4.orig/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dbgaufs.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dbgaufs.h linux-2.6.31.5/fs/aufs/dbgaufs.h
+--- linux-2.6.31.5.orig/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dbgaufs.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -2882,9 +2882,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dbgaufs.h linux-2.6.31.4/fs/aufs/dbgaufs.h
+
+#endif /* __KERNEL__ */
+#endif /* __DBGAUFS_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.c linux-2.6.31.4/fs/aufs/dcsub.c
---- linux-2.6.31.4.orig/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dcsub.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dcsub.c linux-2.6.31.5/fs/aufs/dcsub.c
+--- linux-2.6.31.5.orig/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dcsub.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -3109,9 +3109,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.c linux-2.6.31.4/fs/aufs/dcsub.c
+ out:
+ return trap;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.h linux-2.6.31.4/fs/aufs/dcsub.h
---- linux-2.6.31.4.orig/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dcsub.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dcsub.h linux-2.6.31.5/fs/aufs/dcsub.h
+--- linux-2.6.31.5.orig/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dcsub.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -3167,9 +3167,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dcsub.h linux-2.6.31.4/fs/aufs/dcsub.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DCSUB_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.c linux-2.6.31.4/fs/aufs/debug.c
---- linux-2.6.31.4.orig/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/debug.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/debug.c linux-2.6.31.5/fs/aufs/debug.c
+--- linux-2.6.31.5.orig/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/debug.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,427 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -3598,10 +3598,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.c linux-2.6.31.4/fs/aufs/debug.c
+
+ return 0;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h
---- linux-2.6.31.4.orig/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/debug.h 2009-10-18 11:26:01.000000000 +0200
-@@ -0,0 +1,260 @@
+diff -Nur linux-2.6.31.5.orig/fs/aufs/debug.h linux-2.6.31.5/fs/aufs/debug.h
+--- linux-2.6.31.5.orig/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/debug.h 2009-11-15 22:16:14.000000000 +0100
+@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
+ *
@@ -3629,9 +3629,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h
+
+#ifdef __KERNEL__
+
++#include <asm/system.h>
+#include <linux/bug.h>
+/* #include <linux/err.h> */
-+/* #include <linux/init.h> */
++#include <linux/init.h>
+/* #include <linux/kernel.h> */
+#include <linux/delay.h>
+/* #include <linux/kd.h> */
@@ -3862,9 +3863,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/debug.h linux-2.6.31.4/fs/aufs/debug.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DEBUG_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.c linux-2.6.31.4/fs/aufs/dentry.c
---- linux-2.6.31.4.orig/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dentry.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dentry.c linux-2.6.31.5/fs/aufs/dentry.c
+--- linux-2.6.31.5.orig/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dentry.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,880 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -4746,9 +4747,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.c linux-2.6.31.4/fs/aufs/dentry.c
+ .d_revalidate = aufs_d_revalidate,
+ .d_release = aufs_d_release
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.h linux-2.6.31.4/fs/aufs/dentry.h
---- linux-2.6.31.4.orig/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dentry.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dentry.h linux-2.6.31.5/fs/aufs/dentry.h
+--- linux-2.6.31.5.orig/fs/aufs/dentry.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dentry.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -4981,9 +4982,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dentry.h linux-2.6.31.4/fs/aufs/dentry.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DENTRY_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dinfo.c linux-2.6.31.4/fs/aufs/dinfo.c
---- linux-2.6.31.4.orig/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dinfo.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dinfo.c linux-2.6.31.5/fs/aufs/dinfo.c
+--- linux-2.6.31.5.orig/fs/aufs/dinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dinfo.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,367 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -5352,9 +5353,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dinfo.c linux-2.6.31.4/fs/aufs/dinfo.c
+ return bindex;
+ return -1;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.c linux-2.6.31.4/fs/aufs/dir.c
---- linux-2.6.31.4.orig/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dir.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dir.c linux-2.6.31.5/fs/aufs/dir.c
+--- linux-2.6.31.5.orig/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dir.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,538 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -5894,9 +5895,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.c linux-2.6.31.4/fs/aufs/dir.c
+ .flush = aufs_flush,
+ .fsync = aufs_fsync_dir
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.h linux-2.6.31.4/fs/aufs/dir.h
---- linux-2.6.31.4.orig/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/dir.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/dir.h linux-2.6.31.5/fs/aufs/dir.h
+--- linux-2.6.31.5.orig/fs/aufs/dir.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/dir.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -6012,10 +6013,10 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/dir.h linux-2.6.31.4/fs/aufs/dir.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_DIR_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c
---- linux-2.6.31.4.orig/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/export.c 2009-10-18 11:26:01.000000000 +0200
-@@ -0,0 +1,745 @@
+diff -Nur linux-2.6.31.5.orig/fs/aufs/export.c linux-2.6.31.5/fs/aufs/export.c
+--- linux-2.6.31.5.orig/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/export.c 2009-11-15 22:27:33.000000000 +0100
+@@ -0,0 +1,746 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
+ *
@@ -6041,6 +6042,7 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c
+#include <linux/exportfs.h>
+#include <linux/file.h>
+#include <linux/mnt_namespace.h>
++#include <linux/nsproxy.h>
+#include <linux/namei.h>
+#include <linux/random.h>
+#include "aufs.h"
@@ -6761,9 +6763,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/export.c linux-2.6.31.4/fs/aufs/export.c
+ BUILD_BUG_ON(sizeof(u) != sizeof(int));
+ atomic_set(&sbinfo->si_xigen_next, u);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/file.c linux-2.6.31.4/fs/aufs/file.c
---- linux-2.6.31.4.orig/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/file.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/file.c linux-2.6.31.5/fs/aufs/file.c
+--- linux-2.6.31.5.orig/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/file.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,578 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -7343,9 +7345,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/file.c linux-2.6.31.4/fs/aufs/file.c
+ .direct_IO = aufs_direct_IO,
+#endif /* CONFIG_AUFS_DEBUG */
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/file.h linux-2.6.31.4/fs/aufs/file.h
---- linux-2.6.31.4.orig/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/file.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/file.h linux-2.6.31.5/fs/aufs/file.h
+--- linux-2.6.31.5.orig/fs/aufs/file.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/file.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -7522,9 +7524,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/file.h linux-2.6.31.4/fs/aufs/file.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FILE_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/finfo.c linux-2.6.31.4/fs/aufs/finfo.c
---- linux-2.6.31.4.orig/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/finfo.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/finfo.c linux-2.6.31.5/fs/aufs/finfo.c
+--- linux-2.6.31.5.orig/fs/aufs/finfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/finfo.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -7659,9 +7661,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/finfo.c linux-2.6.31.4/fs/aufs/finfo.c
+
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/f_op.c linux-2.6.31.4/fs/aufs/f_op.c
---- linux-2.6.31.4.orig/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/f_op.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/f_op.c linux-2.6.31.5/fs/aufs/f_op.c
+--- linux-2.6.31.5.orig/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/f_op.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,802 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -8465,9 +8467,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/f_op.c linux-2.6.31.4/fs/aufs/f_op.c
+ .aio_splice_read = aufs_aio_splice_read
+#endif
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/fstype.h linux-2.6.31.4/fs/aufs/fstype.h
---- linux-2.6.31.4.orig/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/fstype.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/fstype.h linux-2.6.31.5/fs/aufs/fstype.h
+--- linux-2.6.31.5.orig/fs/aufs/fstype.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/fstype.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,474 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -8943,9 +8945,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/fstype.h linux-2.6.31.4/fs/aufs/fstype.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_FSTYPE_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/hinotify.c linux-2.6.31.4/fs/aufs/hinotify.c
---- linux-2.6.31.4.orig/fs/aufs/hinotify.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/hinotify.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/hinotify.c linux-2.6.31.5/fs/aufs/hinotify.c
+--- linux-2.6.31.5.orig/fs/aufs/hinotify.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/hinotify.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,755 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -9702,9 +9704,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/hinotify.c linux-2.6.31.4/fs/aufs/hinotify
+ if (au_cachep[AuCache_HINOTIFY])
+ au_hin_destroy_cache();
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/iinfo.c linux-2.6.31.4/fs/aufs/iinfo.c
---- linux-2.6.31.4.orig/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/iinfo.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/iinfo.c linux-2.6.31.5/fs/aufs/iinfo.c
+--- linux-2.6.31.5.orig/fs/aufs/iinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/iinfo.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,283 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -9989,9 +9991,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/iinfo.c linux-2.6.31.4/fs/aufs/iinfo.c
+ kfree(iinfo->ii_hinode);
+ AuRwDestroy(&iinfo->ii_rwsem);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.c linux-2.6.31.4/fs/aufs/inode.c
---- linux-2.6.31.4.orig/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/inode.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/inode.c linux-2.6.31.5/fs/aufs/inode.c
+--- linux-2.6.31.5.orig/fs/aufs/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/inode.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,380 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -10373,9 +10375,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.c linux-2.6.31.4/fs/aufs/inode.c
+ mask |= MAY_READ; /* force permission check */
+ return au_test_h_perm(h_inode, mask);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.h linux-2.6.31.4/fs/aufs/inode.h
---- linux-2.6.31.4.orig/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/inode.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/inode.h linux-2.6.31.5/fs/aufs/inode.h
+--- linux-2.6.31.5.orig/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/inode.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -10861,9 +10863,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/inode.h linux-2.6.31.4/fs/aufs/inode.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_INODE_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/ioctl.c linux-2.6.31.4/fs/aufs/ioctl.c
---- linux-2.6.31.4.orig/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/ioctl.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/ioctl.c linux-2.6.31.5/fs/aufs/ioctl.c
+--- linux-2.6.31.5.orig/fs/aufs/ioctl.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/ioctl.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -10932,9 +10934,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/ioctl.c linux-2.6.31.4/fs/aufs/ioctl.c
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_add.c linux-2.6.31.4/fs/aufs/i_op_add.c
---- linux-2.6.31.4.orig/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/i_op_add.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_add.c linux-2.6.31.5/fs/aufs/i_op_add.c
+--- linux-2.6.31.5.orig/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/i_op_add.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,649 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -11585,9 +11587,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_add.c linux-2.6.31.4/fs/aufs/i_op_add
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op.c linux-2.6.31.4/fs/aufs/i_op.c
---- linux-2.6.31.4.orig/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/i_op.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op.c linux-2.6.31.5/fs/aufs/i_op.c
+--- linux-2.6.31.5.orig/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/i_op.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,872 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -12461,9 +12463,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op.c linux-2.6.31.4/fs/aufs/i_op.c
+ .getattr = aufs_getattr,
+ .truncate_range = aufs_truncate_range
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_del.c linux-2.6.31.4/fs/aufs/i_op_del.c
---- linux-2.6.31.4.orig/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/i_op_del.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_del.c linux-2.6.31.5/fs/aufs/i_op_del.c
+--- linux-2.6.31.5.orig/fs/aufs/i_op_del.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/i_op_del.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,468 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -12933,9 +12935,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_del.c linux-2.6.31.4/fs/aufs/i_op_del
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_ren.c linux-2.6.31.4/fs/aufs/i_op_ren.c
---- linux-2.6.31.4.orig/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/i_op_ren.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/i_op_ren.c linux-2.6.31.5/fs/aufs/i_op_ren.c
+--- linux-2.6.31.5.orig/fs/aufs/i_op_ren.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/i_op_ren.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,948 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -13885,9 +13887,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/i_op_ren.c linux-2.6.31.4/fs/aufs/i_op_ren
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/Kconfig linux-2.6.31.4/fs/aufs/Kconfig
---- linux-2.6.31.4.orig/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/Kconfig 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/Kconfig linux-2.6.31.5/fs/aufs/Kconfig
+--- linux-2.6.31.5.orig/fs/aufs/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/Kconfig 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,132 @@
+config AUFS_FS
+ tristate "Aufs (Advanced multi layered unification filesystem) support"
@@ -14021,9 +14023,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/Kconfig linux-2.6.31.4/fs/aufs/Kconfig
+ help
+ Automatic configuration for internal use.
+endif
-diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.c linux-2.6.31.4/fs/aufs/loop.c
---- linux-2.6.31.4.orig/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/loop.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/loop.c linux-2.6.31.5/fs/aufs/loop.c
+--- linux-2.6.31.5.orig/fs/aufs/loop.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/loop.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -14080,9 +14082,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.c linux-2.6.31.4/fs/aufs/loop.c
+ && '0' <= c && c <= '9'
+ && strncmp(current->comm, "loop", 4) == 0;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.h linux-2.6.31.4/fs/aufs/loop.h
---- linux-2.6.31.4.orig/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/loop.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/loop.h linux-2.6.31.5/fs/aufs/loop.h
+--- linux-2.6.31.5.orig/fs/aufs/loop.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/loop.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -14135,9 +14137,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/loop.h linux-2.6.31.4/fs/aufs/loop.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_LOOP_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/magic.mk linux-2.6.31.4/fs/aufs/magic.mk
---- linux-2.6.31.4.orig/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/magic.mk 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/magic.mk linux-2.6.31.5/fs/aufs/magic.mk
+--- linux-2.6.31.5.orig/fs/aufs/magic.mk 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/magic.mk 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,52 @@
+
+# defined in ${srctree}/fs/fuse/inode.c
@@ -14191,9 +14193,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/magic.mk linux-2.6.31.4/fs/aufs/magic.mk
+ifdef CONFIG_UBIFS_FS
+ccflags-y += -DUBIFS_SUPER_MAGIC=0x24051905
+endif
-diff -Nur linux-2.6.31.4.orig/fs/aufs/Makefile linux-2.6.31.4/fs/aufs/Makefile
---- linux-2.6.31.4.orig/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/Makefile 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/Makefile linux-2.6.31.5/fs/aufs/Makefile
+--- linux-2.6.31.5.orig/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/Makefile 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,23 @@
+
+include ${src}/magic.mk
@@ -14218,9 +14220,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/Makefile linux-2.6.31.4/fs/aufs/Makefile
+aufs-$(CONFIG_AUFS_POLL) += poll.o
+aufs-$(CONFIG_AUFS_DEBUG) += debug.o
+aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
-diff -Nur linux-2.6.31.4.orig/fs/aufs/module.c linux-2.6.31.4/fs/aufs/module.c
---- linux-2.6.31.4.orig/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/module.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/module.c linux-2.6.31.5/fs/aufs/module.c
+--- linux-2.6.31.5.orig/fs/aufs/module.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/module.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -14395,9 +14397,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/module.c linux-2.6.31.4/fs/aufs/module.c
+
+module_init(aufs_init);
+module_exit(aufs_exit);
-diff -Nur linux-2.6.31.4.orig/fs/aufs/module.h linux-2.6.31.4/fs/aufs/module.h
---- linux-2.6.31.4.orig/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/module.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/module.h linux-2.6.31.5/fs/aufs/module.h
+--- linux-2.6.31.5.orig/fs/aufs/module.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/module.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -14477,9 +14479,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/module.h linux-2.6.31.4/fs/aufs/module.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_MODULE_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.c linux-2.6.31.4/fs/aufs/opts.c
---- linux-2.6.31.4.orig/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/opts.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/opts.c linux-2.6.31.5/fs/aufs/opts.c
+--- linux-2.6.31.5.orig/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/opts.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,1543 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16024,9 +16026,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.c linux-2.6.31.4/fs/aufs/opts.c
+{
+ return au_mntflags(sb) & AuOptMask_UDBA;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.h linux-2.6.31.4/fs/aufs/opts.h
---- linux-2.6.31.4.orig/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/opts.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/opts.h linux-2.6.31.5/fs/aufs/opts.h
+--- linux-2.6.31.5.orig/fs/aufs/opts.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/opts.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16224,9 +16226,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/opts.h linux-2.6.31.4/fs/aufs/opts.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_OPTS_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/plink.c linux-2.6.31.4/fs/aufs/plink.c
---- linux-2.6.31.4.orig/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/plink.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/plink.c linux-2.6.31.5/fs/aufs/plink.c
+--- linux-2.6.31.5.orig/fs/aufs/plink.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/plink.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,354 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16582,9 +16584,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/plink.c linux-2.6.31.4/fs/aufs/plink.c
+ iput(inode);
+ }
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/poll.c linux-2.6.31.4/fs/aufs/poll.c
---- linux-2.6.31.4.orig/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/poll.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/poll.c linux-2.6.31.5/fs/aufs/poll.c
+--- linux-2.6.31.5.orig/fs/aufs/poll.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/poll.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16642,9 +16644,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/poll.c linux-2.6.31.4/fs/aufs/poll.c
+ AuTraceErr((int)mask);
+ return mask;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/rwsem.h linux-2.6.31.4/fs/aufs/rwsem.h
---- linux-2.6.31.4.orig/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/rwsem.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/rwsem.h linux-2.6.31.5/fs/aufs/rwsem.h
+--- linux-2.6.31.5.orig/fs/aufs/rwsem.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/rwsem.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -16832,9 +16834,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/rwsem.h linux-2.6.31.4/fs/aufs/rwsem.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_RWSEM_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sbinfo.c linux-2.6.31.4/fs/aufs/sbinfo.c
---- linux-2.6.31.4.orig/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sbinfo.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sbinfo.c linux-2.6.31.5/fs/aufs/sbinfo.c
+--- linux-2.6.31.5.orig/fs/aufs/sbinfo.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sbinfo.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -17044,9 +17046,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sbinfo.c linux-2.6.31.4/fs/aufs/sbinfo.c
+ di_write_unlock2(d1, d2);
+ si_read_unlock(d1->d_sb);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/spl.h linux-2.6.31.4/fs/aufs/spl.h
---- linux-2.6.31.4.orig/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/spl.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/spl.h linux-2.6.31.5/fs/aufs/spl.h
+--- linux-2.6.31.5.orig/fs/aufs/spl.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/spl.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -17105,9 +17107,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/spl.h linux-2.6.31.4/fs/aufs/spl.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SPL_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c
---- linux-2.6.31.4.orig/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/super.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/super.c linux-2.6.31.5/fs/aufs/super.c
+--- linux-2.6.31.5.orig/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/super.c 2009-11-15 22:20:26.000000000 +0100
@@ -0,0 +1,874 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -17494,7 +17496,7 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c
+ lockdep_off();
+ down_write(&h_sb->s_umount);
+ shrink_dcache_sb(h_sb);
-+ fsync_super(h_sb);
++ sync_filesystem(h_sb);
+ up_write(&h_sb->s_umount);
+ lockdep_on();
+ }
@@ -17983,9 +17985,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.c linux-2.6.31.4/fs/aufs/super.c
+ /* no need to __module_get() and module_put(). */
+ .owner = THIS_MODULE,
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/super.h linux-2.6.31.4/fs/aufs/super.h
---- linux-2.6.31.4.orig/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/super.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/super.h linux-2.6.31.5/fs/aufs/super.h
+--- linux-2.6.31.5.orig/fs/aufs/super.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/super.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,384 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18371,9 +18373,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/super.h linux-2.6.31.4/fs/aufs/super.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_SUPER_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.c linux-2.6.31.4/fs/aufs/sysaufs.c
---- linux-2.6.31.4.orig/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sysaufs.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sysaufs.c linux-2.6.31.5/fs/aufs/sysaufs.c
+--- linux-2.6.31.5.orig/fs/aufs/sysaufs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sysaufs.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18479,9 +18481,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.c linux-2.6.31.4/fs/aufs/sysaufs.c
+ out:
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.h linux-2.6.31.4/fs/aufs/sysaufs.h
---- linux-2.6.31.4.orig/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sysaufs.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sysaufs.h linux-2.6.31.5/fs/aufs/sysaufs.h
+--- linux-2.6.31.5.orig/fs/aufs/sysaufs.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sysaufs.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18603,9 +18605,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysaufs.h linux-2.6.31.4/fs/aufs/sysaufs.h
+
+#endif /* __KERNEL__ */
+#endif /* __SYSAUFS_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sysfs.c linux-2.6.31.4/fs/aufs/sysfs.c
---- linux-2.6.31.4.orig/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sysfs.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sysfs.c linux-2.6.31.5/fs/aufs/sysfs.c
+--- linux-2.6.31.5.orig/fs/aufs/sysfs.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sysfs.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18817,9 +18819,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysfs.c linux-2.6.31.4/fs/aufs/sysfs.c
+ AuWarn("failed %s under sysfs(%d)\n", br->br_name, err);
+ }
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/sysrq.c linux-2.6.31.4/fs/aufs/sysrq.c
---- linux-2.6.31.4.orig/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/sysrq.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/sysrq.c linux-2.6.31.5/fs/aufs/sysrq.c
+--- linux-2.6.31.5.orig/fs/aufs/sysrq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/sysrq.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -18936,9 +18938,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/sysrq.c linux-2.6.31.4/fs/aufs/sysrq.c
+ if (unlikely(err))
+ AuErr("err %d (ignored)\n", err);
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/vdir.c linux-2.6.31.4/fs/aufs/vdir.c
---- linux-2.6.31.4.orig/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/vdir.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/vdir.c linux-2.6.31.5/fs/aufs/vdir.c
+--- linux-2.6.31.5.orig/fs/aufs/vdir.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/vdir.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,882 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -19822,9 +19824,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vdir.c linux-2.6.31.4/fs/aufs/vdir.c
+ /* smp_mb(); */
+ return 0;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.c linux-2.6.31.4/fs/aufs/vfsub.c
---- linux-2.6.31.4.orig/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/vfsub.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/vfsub.c linux-2.6.31.5/fs/aufs/vfsub.c
+--- linux-2.6.31.5.orig/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/vfsub.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,740 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -20566,9 +20568,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.c linux-2.6.31.4/fs/aufs/vfsub.c
+
+ return err;
+}
-diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.h linux-2.6.31.4/fs/aufs/vfsub.h
---- linux-2.6.31.4.orig/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/vfsub.h 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/vfsub.h linux-2.6.31.5/fs/aufs/vfsub.h
+--- linux-2.6.31.5.orig/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/vfsub.h 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -20742,9 +20744,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/vfsub.h linux-2.6.31.4/fs/aufs/vfsub.h
+
+#endif /* __KERNEL__ */
+#endif /* __AUFS_VFSUB_H__ */
-diff -Nur linux-2.6.31.4.orig/fs/aufs/wbr_policy.c linux-2.6.31.4/fs/aufs/wbr_policy.c
---- linux-2.6.31.4.orig/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/wbr_policy.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/wbr_policy.c linux-2.6.31.5/fs/aufs/wbr_policy.c
+--- linux-2.6.31.5.orig/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/wbr_policy.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,641 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -21387,9 +21389,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/wbr_policy.c linux-2.6.31.4/fs/aufs/wbr_po
+ .fin = au_wbr_create_fin_mfs
+ }
+};
-diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.c linux-2.6.31.4/fs/aufs/whout.c
---- linux-2.6.31.4.orig/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.31.4/fs/aufs/whout.c 2009-10-18 11:26:01.000000000 +0200
+diff -Nur linux-2.6.31.5.orig/fs/aufs/whout.c linux-2.6.31.5/fs/aufs/whout.c
+--- linux-2.6.31.5.orig/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.31.5/fs/aufs/whout.c 2009-11-15 22:02:37.000000000 +0100
@@ -0,0 +1,1048 @@
+/*
+ * Copyright (C) 2005-2009 Junjiro R. Okajima
@@ -22439,9 +22441,9 @@ diff -Nur linux-2.6.31.4.orig/fs/aufs/whout.c linux-2.6.31.4/fs/aufs/whout.c
+ au_whtmp_rmdir_free(args);