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

aufs: Update to aufs3.x-rcN-20131014 

svn path=/dists/trunk/linux/; revision=20751
This commit is contained in:
Ben Hutchings 2013-10-28 03:50:54 +00:00
parent 3fdbf99d5e
commit f8cb1622f0
5 changed files with 118 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -2,6 +2,9 @@ linux (3.12~rc7-1~exp1) UNRELEASED; urgency=low
* New upstream release candidate
[ Ben Hutchings ]
* aufs: Update to aufs3.x-rcN-20131014
-- Ben Hutchings <ben@decadent.org.uk> Fri, 18 Oct 2013 02:06:38 +0100
linux (3.11.6-1) unstable; urgency=low

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

@ -1,7 +1,7 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Oct 8 00:19:26 2013 +0900
Subject: aufs3.11-20131014
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/b3d0ee1034d45c56bf6d545626f73452f0ee6f27/tree/
Date: Wed Oct 9 20:55:35 2013 +0900
Subject: aufs3.x-rcN-20131014
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/64a158346b45c0d81ba202eeab568f57f7522162/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch generated by debian/patches/features/all/aufs3/gen-patch
@ -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-10-23 16:08:04.071634673 +0100
+++ b/Documentation/ABI/testing/sysfs-aufs 2013-10-28 03:48:03.320849456 +0000
@@ -0,0 +1,31 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@ -94,7 +94,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/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
+++ b/Documentation/filesystems/aufs/README 2013-10-23 16:12:47.331646782 +0100
+++ b/Documentation/filesystems/aufs/README 2013-10-28 03:48:03.320849456 +0000
@@ -0,0 +1,347 @@
+
+Aufs3 -- advanced multi layered unification filesystem version 3.x
@ -609,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-10-23 16:08:04.071634673 +0100
+++ b/Documentation/filesystems/aufs/design/02struct.txt 2013-10-28 03:48:03.320849456 +0000
@@ -0,0 +1,243 @@
+
+# Copyright (C) 2005-2013 Junjiro R. Okajima
@ -1633,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-10-23 16:08:04.071634673 +0100
+++ b/fs/aufs/Makefile 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,42 @@
+
+include ${src}/magic.mk
@ -1741,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-10-23 16:08:04.071634673 +0100
+++ b/fs/aufs/branch.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,1212 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -2956,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/branch.h 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -3265,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/cpup.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,1268 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -4536,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/cpup.h 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -5122,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/dcsub.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -5465,7 +5465,7 @@ 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-10-23 16:12:47.331646782 +0100
+++ b/fs/aufs/debug.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,518 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -5986,7 +5986,7 @@ 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-10-23 16:12:47.331646782 +0100
+++ b/fs/aufs/debug.h 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,249 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -7543,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/dinfo.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,543 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -8089,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/dir.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,645 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -8737,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/dir.h 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -8877,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/dynop.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,380 @@
+/*
+ * Copyright (C) 2010-2013 Junjiro R. Okajima
@ -9339,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/export.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,832 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -10174,8 +10174,8 @@ 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-10-23 16:08:04.075634673 +0100
@@ -0,0 +1,721 @@
+++ b/fs/aufs/f_op.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,726 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
@ -10230,6 +10230,11 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+ au_set_fbstart(file, bindex);
+ au_set_h_fptr(file, bindex, h_file);
+ au_update_figen(file);
+ if (!(file->f_mode & FMODE_WRITE)) {
+ lg_local_lock(&files_lglock);
+ __file_sb_list_add(file, dentry->d_sb);
+ lg_local_unlock(&files_lglock);
+ }
+ /* todo: necessary? */
+ /* file->f_ra = h_file->f_ra; */
+ }
@ -10898,7 +10903,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-10-23 16:08:04.075634673 +0100
+++ b/fs/aufs/f_op_sp.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,383 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -11284,7 +11289,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/file.c 2013-10-28 03:48:03.324849456 +0000
@@ -0,0 +1,725 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -12012,7 +12017,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/file.h 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -12487,7 +12492,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/fstype.h 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,470 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -12960,7 +12965,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-10-23 16:12:47.331646782 +0100
+++ b/fs/aufs/hfsnotify.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,296 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -13259,7 +13264,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/hfsplus.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2010-2013 Junjiro R. Okajima
@ -13319,7 +13324,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/hnotify.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,712 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -14034,7 +14039,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/i_op.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,1118 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -15155,7 +15160,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/i_op_add.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,739 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -15897,7 +15902,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/i_op_del.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -16402,7 +16407,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/i_op_ren.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,1009 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -18791,7 +18796,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-10-23 16:08:04.079634673 +0100
+++ b/fs/aufs/ioctl.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -18996,7 +19001,7 @@ 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-10-23 16:12:47.331646782 +0100
+++ b/fs/aufs/loop.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -19145,7 +19150,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/loop.h 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -19572,7 +19577,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/mvdown.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,610 @@
+/*
+ * Copyright (C) 2011-2013 Junjiro R. Okajima
@ -20185,7 +20190,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/opts.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,1704 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -21892,7 +21897,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/opts.h 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -22861,7 +22866,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/rdu.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,389 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -23444,7 +23449,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/sbinfo.c 2013-10-28 03:48:03.332849456 +0000
@@ -0,0 +1,350 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -23912,7 +23917,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/super.c 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,1002 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -24917,7 +24922,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/super.h 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,568 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -25703,7 +25708,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/sysfs.c 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,297 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -26157,7 +26162,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/vdir.c 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,888 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -27048,7 +27053,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-10-23 16:08:04.083634673 +0100
+++ b/fs/aufs/vfsub.c 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,772 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -27823,8 +27828,8 @@ 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-10-23 16:08:04.083634673 +0100
@@ -0,0 +1,311 @@
+++ b/fs/aufs/vfsub.h 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,312 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
+ *
@ -27862,6 +27867,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+extern struct lglock vfsmount_lock;
+extern void __mnt_drop_write(struct vfsmount *);
+extern spinlock_t inode_sb_list_lock;
+void __file_sb_list_add(struct file *file, struct super_block *sb);
+
+/* copied from linux/fs/file_table.c */
+extern struct lglock files_lglock;
@ -28137,7 +28143,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-10-23 16:08:04.087634673 +0100
+++ b/fs/aufs/wbr_policy.c 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,756 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -30011,7 +30017,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-10-23 16:08:04.087634673 +0100
+++ b/fs/aufs/wkq.c 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -30322,7 +30328,7 @@ 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-10-23 16:12:47.331646782 +0100
+++ b/fs/aufs/xino.c 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,1312 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -31659,7 +31665,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-10-23 16:12:47.331646782 +0100
+++ b/include/uapi/linux/aufs_type.h 2013-10-28 03:48:03.336849456 +0000
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2005-2013 Junjiro R. Okajima
@ -31703,7 +31709,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
+
+#include <linux/limits.h>
+
+#define AUFS_VERSION "3.11-20131014"
+#define AUFS_VERSION "3.x-rcN-20131014"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')

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

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
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/
Date: Thu Sep 19 16:30:08 2013 +0900
Subject: aufs3.x-rcN base patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/64a158346b45c0d81ba202eeab568f57f7522162/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.11 base patch
aufs3.x-rcN base patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 40e7155..6e43ab0 100644
@ -38,7 +38,7 @@ index 40e7155..6e43ab0 100644
static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/file_table.c b/fs/file_table.c
index b44e4c5..aa91109 100644
index abdd15a..da0ee1e 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -36,7 +36,7 @@ struct files_stat_struct files_stat = {
@ -50,11 +50,28 @@ index b44e4c5..aa91109 100644
/* SLAB cache for file structures */
static struct kmem_cache *filp_cachep __read_mostly;
@@ -360,7 +360,7 @@ static inline int file_list_cpu(struct file *file)
}
/* helper for file_sb_list_add to reduce ifdefs */
-static inline void __file_sb_list_add(struct file *file, struct super_block *sb)
+inline void __file_sb_list_add(struct file *file, struct super_block *sb)
{
struct list_head *list;
#ifdef CONFIG_SMP
@@ -373,6 +373,7 @@ static inline void __file_sb_list_add(struct file *file, struct super_block *sb)
#endif
list_add(&file->f_u.fu_list, list);
}
+EXPORT_SYMBOL_GPL(__file_sb_list_add);
/**
* file_sb_list_add - add a file to the sb's file list
diff --git a/fs/inode.c b/fs/inode.c
index d6dfb09..cc35712 100644
index b33ba8e..9b24434 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1500,7 +1500,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
@@ -1469,7 +1469,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
* This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this.
*/
@ -92,10 +109,10 @@ index 3b7ee65..e147583 100644
ssize_t (*splice_read)(struct file *, loff_t *,
struct pipe_inode_info *, size_t, unsigned int);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9818747..146f304 100644
index 3f40547..36b235e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2589,6 +2589,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
@@ -2594,6 +2594,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
extern int inode_newsize_ok(const struct inode *, loff_t offset);
extern void setattr_copy(struct inode *inode, const struct iattr *attr);

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

@ -1,12 +1,12 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
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/
Date: Sat Sep 14 01:15:30 2013 +0900
Subject: aufs3.x-rcN kbuild patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/64a158346b45c0d81ba202eeab568f57f7522162/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.11 kbuild patch
aufs3.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index c229f82..397b473 100644
@ -30,7 +30,7 @@ index 4fe6df3..4a57676 100644
obj-$(CONFIG_EFIVAR_FS) += efivarfs/
+obj-$(CONFIG_AUFS_FS) += aufs/
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 997f9f2..ede7bad 100644
index 115add2..ce305b3 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -56,6 +56,7 @@ header-y += atmppp.h

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

@ -1,15 +1,15 @@
From: J. R. Okajima <hooanon05@yahoo.co.jp>
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/
Date: Tue Oct 1 17:43:27 2013 +0900
Subject: aufs3.x-rcN standalone patch
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/64a158346b45c0d81ba202eeab568f57f7522162/tree/
Bug-Debian: http://bugs.debian.org/541828
Patch headers added by debian/patches/features/all/aufs3/gen-patch
aufs3.11 standalone patch
aufs3.x-rcN standalone patch
diff --git a/fs/file_table.c b/fs/file_table.c
index aa91109..ab2f3c3 100644
index da0ee1e..0a02e12 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -37,6 +37,7 @@ struct files_stat_struct files_stat = {
@ -20,7 +20,7 @@ index aa91109..ab2f3c3 100644
/* SLAB cache for file structures */
static struct kmem_cache *filp_cachep __read_mostly;
@@ -406,6 +407,8 @@ void file_sb_list_del(struct file *file)
@@ -410,6 +411,8 @@ void file_sb_list_del(struct file *file)
}
}
@ -30,10 +30,10 @@ index aa91109..ab2f3c3 100644
/*
diff --git a/fs/inode.c b/fs/inode.c
index cc35712..16e2667 100644
index 9b24434..6ee4b0b 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
@@ -57,6 +57,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
@ -41,7 +41,7 @@ index cc35712..16e2667 100644
/*
* Empty aops. Can be used for the cases where the user does not
@@ -1516,6 +1517,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
@@ -1485,6 +1486,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
mark_inode_dirty_sync(inode);
return 0;
}
@ -50,7 +50,7 @@ index cc35712..16e2667 100644
/**
* touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c
index a45ba4f..f32874b 100644
index da5c494..f40ae6f 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -54,6 +54,7 @@ EXPORT_SYMBOL_GPL(fs_kobj);
@ -69,7 +69,7 @@ index a45ba4f..f32874b 100644
/**
* mnt_drop_write - give up write access to a mount
@@ -1456,6 +1458,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
@@ -1480,6 +1482,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
@ -150,7 +150,7 @@ index 923fe4a..176b435 100644
static int fsnotify_mark_destroy(void *ignored)
{
diff --git a/fs/open.c b/fs/open.c
index 7931f76..4100715 100644
index d420331..6dd3b03 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -61,6 +61,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@ -182,7 +182,7 @@ index e147583..789f6b2 100644
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/security/commoncap.c b/security/commoncap.c
index c44b6fe..d78b003 100644
index b9d613e..ba3b618 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -988,9 +988,11 @@ int cap_mmap_addr(unsigned long addr)
@ -198,7 +198,7 @@ index c44b6fe..d78b003 100644
}
+EXPORT_SYMBOL_GPL(cap_mmap_file);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index e8aad69..5f3baa6 100644
index c123628..efc6f68 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -7,6 +7,7 @@
@ -209,7 +209,7 @@ index e8aad69..5f3baa6 100644
#include <linux/list.h>
#include <linux/uaccess.h>
#include <linux/seq_file.h>
@@ -769,6 +770,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask)
@@ -756,6 +757,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask)
return __devcgroup_check_permission(type, imajor(inode), iminor(inode),
access);
}
@ -218,10 +218,10 @@ index e8aad69..5f3baa6 100644
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
index 94b35ae..42ab55a 100644
index 4dc31f4..1f272bc 100644
--- a/security/security.c
+++ b/security/security.c
@@ -409,6 +409,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
@@ -407,6 +407,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
return 0;
return security_ops->path_rmdir(dir, dentry);
}
@ -229,7 +229,7 @@ index 94b35ae..42ab55a 100644
int security_path_unlink(struct path *dir, struct dentry *dentry)
{
@@ -425,6 +426,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
@@ -423,6 +424,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
return 0;
return security_ops->path_symlink(dir, dentry, old_name);
}
@ -237,7 +237,7 @@ index 94b35ae..42ab55a 100644
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
struct dentry *new_dentry)
@@ -433,6 +435,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
@@ -431,6 +433,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
return 0;
return security_ops->path_link(old_dentry, new_dir, new_dentry);
}
@ -245,7 +245,7 @@ index 94b35ae..42ab55a 100644
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry)
@@ -451,6 +454,7 @@ int security_path_truncate(struct path *path)
@@ -449,6 +452,7 @@ int security_path_truncate(struct path *path)
return 0;
return security_ops->path_truncate(path);
}
@ -253,7 +253,7 @@ index 94b35ae..42ab55a 100644
int security_path_chmod(struct path *path, umode_t mode)
{
@@ -458,6 +462,7 @@ int security_path_chmod(struct path *path, umode_t mode)
@@ -456,6 +460,7 @@ int security_path_chmod(struct path *path, umode_t mode)
return 0;
return security_ops->path_chmod(path, mode);
}
@ -261,7 +261,7 @@ index 94b35ae..42ab55a 100644
int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
{
@@ -465,6 +470,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
@@ -463,6 +468,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)
return 0;
return security_ops->path_chown(path, uid, gid);
}
@ -269,7 +269,7 @@ index 94b35ae..42ab55a 100644
int security_path_chroot(struct path *path)
{
@@ -541,6 +547,7 @@ int security_inode_readlink(struct dentry *dentry)
@@ -539,6 +545,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0;
return security_ops->inode_readlink(dentry);
}
@ -277,7 +277,7 @@ index 94b35ae..42ab55a 100644
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -555,6 +562,7 @@ int security_inode_permission(struct inode *inode, int mask)
@@ -553,6 +560,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return security_ops->inode_permission(inode, mask);
}
@ -285,7 +285,7 @@ index 94b35ae..42ab55a 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
@@ -677,6 +685,7 @@ int security_file_permission(struct file *file, int mask)
@@ -675,6 +683,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
@ -293,7 +293,7 @@ index 94b35ae..42ab55a 100644
int security_file_alloc(struct file *file)
{
@@ -737,6 +746,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
@@ -735,6 +744,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
return ret;
return ima_file_mmap(file, prot);
}