|
|
|
@ -1,17 +1,17 @@
|
|
|
|
From: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
From: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
Date: Mon Jan 13 23:11:18 2014 +0900
|
|
|
|
Date: Tue Jan 21 15:32:38 2014 +0900
|
|
|
|
Subject: aufs3.x-rcN-20140120
|
|
|
|
Subject: aufs3.13-20140127
|
|
|
|
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/94b50bae2118905dca9c63eaa7f29c322ce155d6/tree/
|
|
|
|
Origin: http://sourceforge.net/p/aufs/aufs3-standalone/ci/5bc28eeb80b3ea7bf377f15ffd4b07863160e665/tree/
|
|
|
|
Bug-Debian: http://bugs.debian.org/541828
|
|
|
|
Bug-Debian: http://bugs.debian.org/541828
|
|
|
|
|
|
|
|
|
|
|
|
Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
|
|
|
|
|
|
|
|
--- a/Documentation/ABI/testing/debugfs-aufs 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
--- 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 @@
|
|
|
|
@@ -0,0 +1,50 @@
|
|
|
|
+What: /debug/aufs/si_<id>/
|
|
|
|
+What: /debug/aufs/si_<id>/
|
|
|
|
+Date: March 2009
|
|
|
|
+Date: March 2009
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ Under /debug/aufs, a directory named si_<id> is created
|
|
|
|
+ Under /debug/aufs, a directory named si_<id> is created
|
|
|
|
+ per aufs mount, where <id> is a unique id generated
|
|
|
|
+ per aufs mount, where <id> is a unique id generated
|
|
|
|
@ -19,7 +19,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+What: /debug/aufs/si_<id>/plink
|
|
|
|
+What: /debug/aufs/si_<id>/plink
|
|
|
|
+Date: Apr 2013
|
|
|
|
+Date: Apr 2013
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ It has three lines and shows the information about the
|
|
|
|
+ It has three lines and shows the information about the
|
|
|
|
+ pseudo-link. The first line is a single number
|
|
|
|
+ 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_<id>/xib
|
|
|
|
+What: /debug/aufs/si_<id>/xib
|
|
|
|
+Date: March 2009
|
|
|
|
+Date: March 2009
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ It shows the consumed blocks by xib (External Inode Number
|
|
|
|
+ It shows the consumed blocks by xib (External Inode Number
|
|
|
|
+ Bitmap), its block size and file size.
|
|
|
|
+ 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_<id>/xino0, xino1 ... xinoN
|
|
|
|
+What: /debug/aufs/si_<id>/xino0, xino1 ... xinoN
|
|
|
|
+Date: March 2009
|
|
|
|
+Date: March 2009
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ It shows the consumed blocks by xino (External Inode Number
|
|
|
|
+ It shows the consumed blocks by xino (External Inode Number
|
|
|
|
+ Translation Table), its link count, block size and file
|
|
|
|
+ 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_<id>/xigen
|
|
|
|
+What: /debug/aufs/si_<id>/xigen
|
|
|
|
+Date: March 2009
|
|
|
|
+Date: March 2009
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ It shows the consumed blocks by xigen (External Inode
|
|
|
|
+ It shows the consumed blocks by xigen (External Inode
|
|
|
|
+ Generation Table), its block size and file size.
|
|
|
|
+ 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
|
|
|
|
+ When the aufs mount option 'noxino' is specified, it
|
|
|
|
+ will be empty. About XINO files, see the aufs manual.
|
|
|
|
+ will be empty. About XINO files, see the aufs manual.
|
|
|
|
--- a/Documentation/ABI/testing/sysfs-aufs 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
--- 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 @@
|
|
|
|
@@ -0,0 +1,31 @@
|
|
|
|
+What: /sys/fs/aufs/si_<id>/
|
|
|
|
+What: /sys/fs/aufs/si_<id>/
|
|
|
|
+Date: March 2009
|
|
|
|
+Date: March 2009
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ Under /sys/fs/aufs, a directory named si_<id> is created
|
|
|
|
+ Under /sys/fs/aufs, a directory named si_<id> is created
|
|
|
|
+ per aufs mount, where <id> is a unique id generated
|
|
|
|
+ per aufs mount, where <id> is a unique id generated
|
|
|
|
@ -72,21 +72,21 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+What: /sys/fs/aufs/si_<id>/br0, br1 ... brN
|
|
|
|
+What: /sys/fs/aufs/si_<id>/br0, br1 ... brN
|
|
|
|
+Date: March 2009
|
|
|
|
+Date: March 2009
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ It shows the abolute path of a member directory (which
|
|
|
|
+ It shows the abolute path of a member directory (which
|
|
|
|
+ is called branch) in aufs, and its permission.
|
|
|
|
+ is called branch) in aufs, and its permission.
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+What: /sys/fs/aufs/si_<id>/brid0, brid1 ... bridN
|
|
|
|
+What: /sys/fs/aufs/si_<id>/brid0, brid1 ... bridN
|
|
|
|
+Date: July 2013
|
|
|
|
+Date: July 2013
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ It shows the id of a member directory (which is called
|
|
|
|
+ It shows the id of a member directory (which is called
|
|
|
|
+ branch) in aufs.
|
|
|
|
+ branch) in aufs.
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+What: /sys/fs/aufs/si_<id>/xi_path
|
|
|
|
+What: /sys/fs/aufs/si_<id>/xi_path
|
|
|
|
+Date: March 2009
|
|
|
|
+Date: March 2009
|
|
|
|
+Contact: J. R. Okajima <hooanon05@yahoo.co.jp>
|
|
|
|
+Contact: J. R. Okajima <hooanon05g@gmail.com>
|
|
|
|
+Description:
|
|
|
|
+Description:
|
|
|
|
+ It shows the abolute path of XINO (External Inode Number
|
|
|
|
+ It shows the abolute path of XINO (External Inode Number
|
|
|
|
+ Bitmap, Translation Table and Generation Table) file
|
|
|
|
+ Bitmap, Translation Table and Generation Table) file
|
|
|
|
@ -6213,7 +6213,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+#endif /* __KERNEL__ */
|
|
|
|
+#endif /* __KERNEL__ */
|
|
|
|
+#endif /* __AUFS_DEBUG_H__ */
|
|
|
|
+#endif /* __AUFS_DEBUG_H__ */
|
|
|
|
--- a/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
--- 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 @@
|
|
|
|
@@ -0,0 +1,1081 @@
|
|
|
|
+/*
|
|
|
|
+/*
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
@ -7113,7 +7113,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+ goto err;
|
|
|
|
+ goto err;
|
|
|
|
+ continue;
|
|
|
|
+ continue;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ err:
|
|
|
|
+err:
|
|
|
|
+ err = -EINVAL;
|
|
|
|
+ err = -EINVAL;
|
|
|
|
+ break;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
@ -8078,7 +8078,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+ return -1;
|
|
|
|
+ return -1;
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
--- a/fs/aufs/dir.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
--- 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 @@
|
|
|
|
@@ -0,0 +1,639 @@
|
|
|
|
+/*
|
|
|
|
+/*
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
+ * 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;
|
|
|
|
+ nlink += h_dir->i_nlink - 2;
|
|
|
|
+ if (h_dir->i_nlink < 2)
|
|
|
|
+ if (h_dir->i_nlink < 2)
|
|
|
|
+ nlink += 2;
|
|
|
|
+ nlink += 2;
|
|
|
|
+ smp_mb();
|
|
|
|
+ smp_mb(); /* for i_nlink */
|
|
|
|
+ /* 0 can happen in revaliding */
|
|
|
|
+ /* 0 can happen in revaliding */
|
|
|
|
+ set_nlink(dir, nlink);
|
|
|
|
+ set_nlink(dir, nlink);
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
@ -8129,7 +8129,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+ nlink -= h_dir->i_nlink - 2;
|
|
|
|
+ nlink -= h_dir->i_nlink - 2;
|
|
|
|
+ if (h_dir->i_nlink < 2)
|
|
|
|
+ if (h_dir->i_nlink < 2)
|
|
|
|
+ nlink -= 2;
|
|
|
|
+ nlink -= 2;
|
|
|
|
+ smp_mb();
|
|
|
|
+ smp_mb(); /* for i_nlink */
|
|
|
|
+ /* nlink == 0 means the branch-fs is broken */
|
|
|
|
+ /* nlink == 0 means the branch-fs is broken */
|
|
|
|
+ set_nlink(dir, nlink);
|
|
|
|
+ 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
|
|
|
|
--- 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 @@
|
|
|
|
@@ -0,0 +1,710 @@
|
|
|
|
+/*
|
|
|
|
+/*
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
@ -13685,7 +13685,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+ break;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ cont_unlock:
|
|
|
|
+cont_unlock:
|
|
|
|
+ spin_unlock(&d->d_lock);
|
|
|
|
+ spin_unlock(&d->d_lock);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ spin_unlock(&parent->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();
|
|
|
|
+ au_hn_destroy_cache();
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
--- a/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
--- 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 @@
|
|
|
|
@@ -0,0 +1,1127 @@
|
|
|
|
+/*
|
|
|
|
+/*
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
+ * 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 = inode->i_nlink;
|
|
|
|
+ n -= nlink;
|
|
|
|
+ n -= nlink;
|
|
|
|
+ n += st->nlink;
|
|
|
|
+ n += st->nlink;
|
|
|
|
+ smp_mb();
|
|
|
|
+ smp_mb(); /* for i_nlink */
|
|
|
|
+ /* 0 can happen */
|
|
|
|
+ /* 0 can happen */
|
|
|
|
+ set_nlink(inode, n);
|
|
|
|
+ set_nlink(inode, n);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
@ -20221,7 +20221,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+ return err;
|
|
|
|
+ return err;
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
--- a/fs/aufs/opts.c 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
--- 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 @@
|
|
|
|
@@ -0,0 +1,1701 @@
|
|
|
|
+/*
|
|
|
|
+/*
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
@ -21609,7 +21609,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+ goto add;
|
|
|
|
+ goto add;
|
|
|
|
+ case Opt_prepend:
|
|
|
|
+ case Opt_prepend:
|
|
|
|
+ opt->add.bindex = 0;
|
|
|
|
+ opt->add.bindex = 0;
|
|
|
|
+ add:
|
|
|
|
+ add: /* indented label */
|
|
|
|
+ case Opt_add:
|
|
|
|
+ case Opt_add:
|
|
|
|
+ err = au_br_add(sb, &opt->add,
|
|
|
|
+ err = au_br_add(sb, &opt->add,
|
|
|
|
+ au_ftest_opts(opts->flags, REMOUNT));
|
|
|
|
+ au_ftest_opts(opts->flags, REMOUNT));
|
|
|
|
@ -31688,7 +31688,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+ return err;
|
|
|
|
+ return err;
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
--- a/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
|
|
|
|
--- 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 @@
|
|
|
|
@@ -0,0 +1,281 @@
|
|
|
|
+/*
|
|
|
|
+/*
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
+ * Copyright (C) 2005-2014 Junjiro R. Okajima
|
|
|
|
@ -31731,7 +31731,7 @@ Patch generated by debian/patches/features/all/aufs3/gen-patch
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#include <linux/limits.h>
|
|
|
|
+#include <linux/limits.h>
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#define AUFS_VERSION "3.x-rcN-20140120"
|
|
|
|
+#define AUFS_VERSION "3.13-20140127"
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+/* todo? move this to linux-2.6.19/include/magic.h */
|
|
|
|
+/* todo? move this to linux-2.6.19/include/magic.h */
|
|
|
|
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
|
|
|
|
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
|
|
|
|
|
Ben Hutchings