From 68e6dd6f327eab6ccf712cc2a5029fa5ca10c2c5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 23 Feb 2014 23:55:52 +0000 Subject: [PATCH] aufs: Update to aufs3.13-20140127 (no functional changes) svn path=/dists/sid/linux/; revision=21109 --- debian/changelog | 1 + .../features/all/aufs3/aufs3-add.patch | 54 +++++++++---------- .../features/all/aufs3/aufs3-base.patch | 8 +-- .../features/all/aufs3/aufs3-kbuild.patch | 8 +-- .../features/all/aufs3/aufs3-mmap.patch | 10 ++-- .../features/all/aufs3/aufs3-standalone.patch | 10 ++-- 6 files changed, 46 insertions(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index e705551f5..745ef0bc3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux (3.13.4-2) UNRELEASED; urgency=medium [ Ben Hutchings ] * [armhf] net/wireless: Really enable WL_TI and dependent modules + * aufs: Update to aufs3.13-20140127 (no functional changes) -- Ben Hutchings Sat, 22 Feb 2014 19:15:01 +0000 diff --git a/debian/patches/features/all/aufs3/aufs3-add.patch b/debian/patches/features/all/aufs3/aufs3-add.patch index b741a0efe..af9565efa 100644 --- a/debian/patches/features/all/aufs3/aufs3-add.patch +++ b/debian/patches/features/all/aufs3/aufs3-add.patch @@ -1,17 +1,17 @@ From: J. R. Okajima -Date: Mon Jan 13 23:11:18 2014 +0900 -Subject: aufs3.x-rcN-20140120 -Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/94b50bae2118905dca9c63eaa7f29c322ce155d6/tree/ +Date: Tue Jan 21 15:32:38 2014 +0900 +Subject: aufs3.13-20140127 +Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/5bc28eeb80b3ea7bf377f15ffd4b07863160e665/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.000000000 +0100 ++++ b/Documentation/ABI/testing/debugfs-aufs 2014-02-23 23:54:38.779682273 +0000 @@ -0,0 +1,50 @@ +What: /debug/aufs/si_/ +Date: March 2009 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + Under /debug/aufs, a directory named si_ is created + per aufs mount, where is a unique id generated @@ -19,7 +19,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + +What: /debug/aufs/si_/plink +Date: Apr 2013 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + It has three lines and shows the information about the + pseudo-link. The first line is a single number @@ -32,7 +32,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + +What: /debug/aufs/si_/xib +Date: March 2009 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + It shows the consumed blocks by xib (External Inode Number + Bitmap), its block size and file size. @@ -41,7 +41,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + +What: /debug/aufs/si_/xino0, xino1 ... xinoN +Date: March 2009 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + It shows the consumed blocks by xino (External Inode Number + Translation Table), its link count, block size and file @@ -51,7 +51,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + +What: /debug/aufs/si_/xigen +Date: March 2009 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + It shows the consumed blocks by xigen (External Inode + Generation Table), its block size and file size. @@ -60,11 +60,11 @@ 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-28 03:48:03.320849456 +0000 ++++ b/Documentation/ABI/testing/sysfs-aufs 2014-02-23 23:54:38.779682273 +0000 @@ -0,0 +1,31 @@ +What: /sys/fs/aufs/si_/ +Date: March 2009 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + Under /sys/fs/aufs, a directory named si_ is created + per aufs mount, where is a unique id generated @@ -72,21 +72,21 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + +What: /sys/fs/aufs/si_/br0, br1 ... brN +Date: March 2009 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + It shows the abolute path of a member directory (which + is called branch) in aufs, and its permission. + +What: /sys/fs/aufs/si_/brid0, brid1 ... bridN +Date: July 2013 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + It shows the id of a member directory (which is called + branch) in aufs. + +What: /sys/fs/aufs/si_/xi_path +Date: March 2009 -+Contact: J. R. Okajima ++Contact: J. R. Okajima +Description: + It shows the abolute path of XINO (External Inode Number + Bitmap, Translation Table and Generation Table) file @@ -6213,7 +6213,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 2014-01-20 03:24:33.508760970 +0000 ++++ b/fs/aufs/dentry.c 2014-02-23 23:54:38.779682273 +0000 @@ -0,0 +1,1081 @@ +/* + * Copyright (C) 2005-2014 Junjiro R. Okajima @@ -7113,7 +7113,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + goto err; + continue; + -+ err: ++err: + err = -EINVAL; + break; + } @@ -8078,7 +8078,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 2014-01-20 03:24:33.512760970 +0000 ++++ b/fs/aufs/dir.c 2014-02-23 23:54:38.779682273 +0000 @@ -0,0 +1,639 @@ +/* + * Copyright (C) 2005-2014 Junjiro R. Okajima @@ -8114,7 +8114,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + nlink += h_dir->i_nlink - 2; + if (h_dir->i_nlink < 2) + nlink += 2; -+ smp_mb(); ++ smp_mb(); /* for i_nlink */ + /* 0 can happen in revaliding */ + set_nlink(dir, nlink); +} @@ -8129,7 +8129,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + nlink -= h_dir->i_nlink - 2; + if (h_dir->i_nlink < 2) + nlink -= 2; -+ smp_mb(); ++ smp_mb(); /* for i_nlink */ + /* nlink == 0 means the branch-fs is broken */ + set_nlink(dir, nlink); +} @@ -13289,7 +13289,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 2014-01-20 03:24:33.512760970 +0000 ++++ b/fs/aufs/hnotify.c 2014-02-23 23:54:38.783682273 +0000 @@ -0,0 +1,710 @@ +/* + * Copyright (C) 2005-2014 Junjiro R. Okajima @@ -13685,7 +13685,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + break; + } + -+ cont_unlock: ++cont_unlock: + spin_unlock(&d->d_lock); + } + spin_unlock(&parent->d_lock); @@ -14002,7 +14002,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 2014-01-20 03:24:33.512760970 +0000 ++++ b/fs/aufs/i_op.c 2014-02-23 23:54:38.783682273 +0000 @@ -0,0 +1,1127 @@ +/* + * Copyright (C) 2005-2014 Junjiro R. Okajima @@ -14879,7 +14879,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + n = inode->i_nlink; + n -= nlink; + n += st->nlink; -+ smp_mb(); ++ smp_mb(); /* for i_nlink */ + /* 0 can happen */ + set_nlink(inode, n); + } @@ -20221,7 +20221,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 2014-01-20 03:24:33.516760970 +0000 ++++ b/fs/aufs/opts.c 2014-02-23 23:54:38.783682273 +0000 @@ -0,0 +1,1701 @@ +/* + * Copyright (C) 2005-2014 Junjiro R. Okajima @@ -21609,7 +21609,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + goto add; + case Opt_prepend: + opt->add.bindex = 0; -+ add: ++ add: /* indented label */ + case Opt_add: + err = au_br_add(sb, &opt->add, + au_ftest_opts(opts->flags, REMOUNT)); @@ -31688,7 +31688,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + return err; +} --- a/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/uapi/linux/aufs_type.h 2014-01-20 03:24:33.520760970 +0000 ++++ b/include/uapi/linux/aufs_type.h 2014-02-23 23:54:38.783682273 +0000 @@ -0,0 +1,281 @@ +/* + * Copyright (C) 2005-2014 Junjiro R. Okajima @@ -31731,7 +31731,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch + +#include + -+#define AUFS_VERSION "3.x-rcN-20140120" ++#define AUFS_VERSION "3.13-20140127" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') diff --git a/debian/patches/features/all/aufs3/aufs3-base.patch b/debian/patches/features/all/aufs3/aufs3-base.patch index 31ebebaea..57bca8740 100644 --- a/debian/patches/features/all/aufs3/aufs3-base.patch +++ b/debian/patches/features/all/aufs3/aufs3-base.patch @@ -1,12 +1,12 @@ From: J. R. Okajima -Date: Wed Dec 18 12:37:33 2013 +0900 -Subject: aufs3.x-rcN base patch -Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/94b50bae2118905dca9c63eaa7f29c322ce155d6/tree/ +Date: Tue Jan 21 15:32:38 2014 +0900 +Subject: aufs3.13 base patch +Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/5bc28eeb80b3ea7bf377f15ffd4b07863160e665/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.13 base patch diff --git a/drivers/block/loop.c b/drivers/block/loop.c index c8dac73..2e229ac 100644 diff --git a/debian/patches/features/all/aufs3/aufs3-kbuild.patch b/debian/patches/features/all/aufs3/aufs3-kbuild.patch index 934095d99..21286dbb4 100644 --- a/debian/patches/features/all/aufs3/aufs3-kbuild.patch +++ b/debian/patches/features/all/aufs3/aufs3-kbuild.patch @@ -1,12 +1,12 @@ From: J. R. Okajima -Date: Wed Dec 18 12:37:33 2013 +0900 -Subject: aufs3.x-rcN kbuild patch -Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/94b50bae2118905dca9c63eaa7f29c322ce155d6/tree/ +Date: Tue Jan 21 15:32:38 2014 +0900 +Subject: aufs3.13 kbuild patch +Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/5bc28eeb80b3ea7bf377f15ffd4b07863160e665/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.13 kbuild patch diff --git a/fs/Kconfig b/fs/Kconfig index c229f82..397b473 100644 diff --git a/debian/patches/features/all/aufs3/aufs3-mmap.patch b/debian/patches/features/all/aufs3/aufs3-mmap.patch index 0547c6881..12afc318d 100644 --- a/debian/patches/features/all/aufs3/aufs3-mmap.patch +++ b/debian/patches/features/all/aufs3/aufs3-mmap.patch @@ -1,12 +1,12 @@ From: J. R. Okajima -Date: Thu Jan 9 15:51:36 2014 +0900 -Subject: aufs3.x-rcN mmap patch -Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/94b50bae2118905dca9c63eaa7f29c322ce155d6/tree/ +Date: Tue Jan 21 15:32:38 2014 +0900 +Subject: aufs3.13 mmap patch +Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/5bc28eeb80b3ea7bf377f15ffd4b07863160e665/tree/ Bug-Debian: http://bugs.debian.org/541828 Patch headers added by debian/patches/features/all/aufs3/gen-patch -aufs3.x-rcN mmap patch +aufs3.13 mmap patch diff --git a/fs/buffer.c b/fs/buffer.c index 6024877..95bbf13 100644 @@ -197,7 +197,7 @@ index 290901a..c21588b 100644 #ifndef CONFIG_MMU diff --git a/kernel/fork.c b/kernel/fork.c -index 5721f0e..ae597af 100644 +index dfa736c..02abdb6 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -412,7 +412,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) diff --git a/debian/patches/features/all/aufs3/aufs3-standalone.patch b/debian/patches/features/all/aufs3/aufs3-standalone.patch index af02d9e1a..a85122434 100644 --- a/debian/patches/features/all/aufs3/aufs3-standalone.patch +++ b/debian/patches/features/all/aufs3/aufs3-standalone.patch @@ -1,12 +1,12 @@ From: J. R. Okajima -Date: Wed Dec 18 12:37:33 2013 +0900 -Subject: aufs3.x-rcN standalone patch -Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/94b50bae2118905dca9c63eaa7f29c322ce155d6/tree/ +Date: Tue Jan 21 15:32:38 2014 +0900 +Subject: aufs3.13 standalone patch +Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/5bc28eeb80b3ea7bf377f15ffd4b07863160e665/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.13 standalone patch diff --git a/fs/inode.c b/fs/inode.c index bc83168..6dd1207 100644 @@ -29,7 +29,7 @@ index bc83168..6dd1207 100644 /** * touch_atime - update the access time diff --git a/fs/namespace.c b/fs/namespace.c -index ac2ce8a..83b0135 100644 +index be32ebc..d3f6f59 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -425,6 +425,7 @@ void __mnt_drop_write(struct vfsmount *mnt)