# ChangeLog for sys-fs/aufs2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.20 2010/05/17 17:04:58 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.21 2010/05/25 16:09:36 tommy Exp $
+
+*aufs2-0_p20100524 (25 May 2010)
+
+ 25 May 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ -aufs2-0_p20100308.ebuild, +aufs2-0_p20100524.ebuild,
+ +files/aufs2-base-27.patch, files/aufs2-standalone-27.patch,
+ files/aufs2-standalone-28.patch, files/aufs2-standalone-29.patch,
+ files/aufs2-standalone-30.patch, files/aufs2-base-31.patch,
+ +files/aufs2-base-34.patch, +files/aufs2-standalone-34.patch:
+ Version bump, includes support for kernel 2.6.34
17 May 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
aufs2-0_p20100405.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX aufs2-base-27.patch 2895 RMD160 5159918ce498d82923bbda6ee6766b6cc40cf74a SHA1 909c52e7343ac990918f7cbb78ca8eb7126c7c24 SHA256 26f82b4d623579e0fd721dcee7191ad54c9742804468769dc32f18f451060a97
AUX aufs2-base-28.patch 2895 RMD160 8055dd188e288ba4e66fafd11d78dcf5e97cae90 SHA1 ed691340ef5abce398f8b11e679b64db9bcee312 SHA256 d1869072da1a25d908a06dd34700cf8c5b03fde93b3d7ffef0d6a2948396430e
AUX aufs2-base-29.patch 2895 RMD160 bf89ba5f9f52ea1b9e320439e0bc18f8a006c8c3 SHA1 92a4aff3a945ea7a4a4509ed3539d0a3689c0737 SHA256 b4d8c9883f7f919f0d0a15792420e59f14d41bc1b0daab906ba7affc29485dac
AUX aufs2-base-30.patch 2895 RMD160 13d6fcb45135e4177d6dd506bc7a32fc6b2741fe SHA1 4845f3608540dbc0fa2fa5c914907eb14b51a0f0 SHA256 11f9061805e715c9d9a58dab04a32876ed27bced61c3157cde4e58a08dcdde51
-AUX aufs2-base-31.patch 3086 RMD160 df84e409111526f48e5ffcf7b9d269aa6f9abce6 SHA1 e422dc0a95e3fe398d8ab178d7b34caaf8d0507f SHA256 c75e1f1d6d8320347f109535d65d36d4b3843cf95f3db2b0198b7f61c0f50948
+AUX aufs2-base-31.patch 3088 RMD160 7e5c9cb60e39d7584a84536d3380bafab1e80a4d SHA1 257ba953b26d1fb47897e0ab4573baab834d4bbf SHA256 53e89145de687d0258ded6c889ad284ae5525fb4aa1a05f432b96d67c6b9b3e5
AUX aufs2-base-32.patch 3088 RMD160 d2225a227dcee3ceb166dcbb52757c07da93621c SHA1 ce9f64ff2b3e173ab7caf226683a73e41cf58d91 SHA256 46522f1701f907e02776f5ae049802337b583fd6259f4e8468ff4a48cbf8d957
AUX aufs2-base-33.patch 3049 RMD160 227353c3964819b745c57d404df80e5dea393bf9 SHA1 aaa0b1a41d513cd939db9e6d4369b188f25b79df SHA256 3e602dfd1791d21d9067b95698ab123c00b89b63e2147e8c2f62959c7d39c2ee
-AUX aufs2-standalone-27.patch 7441 RMD160 754f282fb14e1c8be0e1f4e84c131c4bdb50f1a7 SHA1 6d38c1b43d5d2af37fd926a6cf7f9ab159733a5a SHA256 0eb880e1313c1a446bcdf63e7e8132d2c44efb47dc16c7f2c0c141dc8cc7b90e
-AUX aufs2-standalone-28.patch 3930 RMD160 40c2efb98084887425e3de60e44c893624e05802 SHA1 a66d3cf45b66a71c3848f593ac8a9ca084945d29 SHA256 84e1f4afb7897551f72661b4c2c5e459147309c8cf29be13821b7b5e695a489f
-AUX aufs2-standalone-29.patch 5748 RMD160 67fdda784ef736559e4b12038e625f5422351005 SHA1 8feb9ed859c239cda93863c8a965b3a13c563f71 SHA256 1b6d93c6b0fedbed48caa539ec231196f84cf697ca5bfe117f64a87aa17db33b
-AUX aufs2-standalone-30.patch 5432 RMD160 4a9979bb29164ee81e25c920df0dadbb6c496698 SHA1 1bcebf7b22f784834e5d5f0a25467de31f12320f SHA256 c2972ecca3562b34a2b68800b2322801f614d1945923b6fe7da711392ec37484
+AUX aufs2-base-34.patch 3049 RMD160 ef1e9613801baafb198fe7708ad91e4302dd4a0a SHA1 97bdaf3dbb860a4ee2d13c2d639424d7ef83b3f7 SHA256 717d41a01a596789a976ce79a04fe130efd1b0f59a7dd5d1625d338fc95e83f0
+AUX aufs2-standalone-27.patch 4322 RMD160 a3b0adae7a34369d5835848b32c8bdb90ceb1f14 SHA1 9677eea003fad79255ad876e132d3c5b436f9c14 SHA256 2db4ce52e67f31aeac41010279dd3bc680218ad3080437834caaddd6397a0353
+AUX aufs2-standalone-28.patch 4322 RMD160 5bab72a393a5a5878930d25d20d9c916cd374ba3 SHA1 f9cd11351679e3f759d9e4cccdcb3adfc2590157 SHA256 272bc7bd5873de054370868588646de9a0a71430570c7670cb9201d27268b0a7
+AUX aufs2-standalone-29.patch 6140 RMD160 f97d4bb7a27c83a7de40bf37754f51ccddd962fd SHA1 22d7ed995a5efa3d5c57835b6496c857e91eda92 SHA256 237bedbfc270c0042e62aebd0caa79a0372150f884492435503e6d838fc04d4c
+AUX aufs2-standalone-30.patch 5747 RMD160 84b1d573d66ba7c72c5969190a251e3e446bc30b SHA1 f6ae5849c36bb621c953131f5aa96c3de72ef327 SHA256 4e6169ec73d4eb45e57370bf586f3f75fe79cb064176d1570770ac40e8be6e86
AUX aufs2-standalone-31.patch 8573 RMD160 62ccf355504e99a4bdcc2e66eb4ef6426a6bcea4 SHA1 965e181bd2121d8d10ec71fcabc14999e8adcc37 SHA256 d0cc154608cb65523671d16f3a301ff82fb03b3a36889d86802b6bb246641a1f
AUX aufs2-standalone-32.patch 8573 RMD160 47958e632664dd24dab86102b11cd897dc1a3e43 SHA1 72bb326aa6dfd166f09d4f180dd0d3704e0a6743 SHA256 aea4df11245b7f6cc9fa981840c7ebcc7f21d27e20fd0e569c249a08a8b7ceef
AUX aufs2-standalone-33.patch 8629 RMD160 948926f2067e122a075a5aa03d5a4d5b2d3cf11a SHA1 510fc63ab879377227f036f73841f69b411f79ad SHA256 ce3414ac7976ac2a357d0a20ccd0c5a0d5d1a4a1154b4c24f017ded3aebb8341
+AUX aufs2-standalone-34.patch 8602 RMD160 c39575d284e355d98148907689ca115b23cbf492 SHA1 9dd81c20ab21f35e544c5e966b6eb7423199fc78 SHA256 185f7948c4fdefa0687edfcc7de73836690a3bfae5c28ab06e7fbf4101cb4139
AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62
-DIST aufs2-0_p20100308.tar.bz2 5279852 RMD160 d9399bcaf02037c0e6b9cff2c0e2c5430a4bb174 SHA1 d9e69bd75b7290dd661eebfea7c3e6e9643a13c5 SHA256 6216f67753dddb42fdcc5c54267be151e9acb9ee76d409f3a322128a12e91057
DIST aufs2-0_p20100405.tar.bz2 7105573 RMD160 69c638543e247730cb6be3de3741d18db20be08b SHA1 ccbe21cab7bf67c63e9986d620f2d037557242ea SHA256 8d09d5c101186f01a49bd40acf83f97c9161b5c26e307f0592f55fd0b88a5701
-EBUILD aufs2-0_p20100308.ebuild 3099 RMD160 e8f48485e9a4f239a2a255f7afb2bfa77c1bdc3c SHA1 ce065d62c622f8d1abb2b7fdd625d83903379039 SHA256 03eff3988ec89d768260dc89cb99c36d7fb98b5a22559a4818f26cd9c017ef8f
+DIST aufs2-0_p20100524.tar.bz2 9050579 RMD160 68babff24c29ecebfe8b412a63fe08c5f22be5c5 SHA1 2305c0f58d8057d13f8ecbe1376a570c53d087af SHA256 be7974855c79d2bb9e3f6f69763151d18aeea040d892cb2d71f51e74def0ee2d
EBUILD aufs2-0_p20100405.ebuild 3098 RMD160 ab217a1e1c3f2d97b8f510928749638ef9c38924 SHA1 0b9897f7a20d6491c305ba1950d4a55b98322ec2 SHA256 396557502b782ceeb1c0f7c26e501a1e8ef4c7eec4f91f479109ee2424d247b9
-MISC ChangeLog 4472 RMD160 908a34fe2f86946d89cf61164165c77be0c10c22 SHA1 ae1dbbce7631aae4674d8e4afff8b893e30d37ca SHA256 f5a4becb4c8b87087f1b412cb0b96e736b1bbb46462b7f0c9fbefb160e217ff4
+EBUILD aufs2-0_p20100524.ebuild 3098 RMD160 5533f0954d928344eeab257658238e2a4d8366b2 SHA1 a94211ff7b735d4cbd955e1d89e2e9291ed03ba5 SHA256 9440038b9e94bc2c283c958e48ea873960ff98c88a5b792c1a2ac3a149f714ad
+MISC ChangeLog 4930 RMD160 3ce948ebdfcece5118c78eef66b137600d714fad SHA1 e448f51857a09ee467fd8a0b8a731e797fed7c15 SHA256 425936fdd225df9bcb29dafc744b7eef738f1fe44e17bb024b21a9f09e511420
MISC metadata.xml 550 RMD160 7269bc138013ec091e6025c4cb09148bd7740db5 SHA1 18b669d81765a665d50d3df22d14d77b576a89c1 SHA256 e9ea661a4a691f3c119d65ebab8ee933df91862f63a8cbfb8a1591307e49fc03
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iJwEAQECAAYFAkvxd0YACgkQG7kqcTWJkGfSXAP/SlpZg99hmH74tfwfXf2LJVrV
-2TlFbIrn/nA2DLE3Tu6tJWk0HnJLZKw1b13NRjClqiU31RieYsY/sBZCiJWXATLX
-I6XivG6UqUqFNQr7nok7SfVYuBPLYcY+6uck8D6JcbZ/nAYfWVuYJF5mzxZCd0so
-QCj19GToqfTRbdyuwfU=
-=azma
+iJwEAQECAAYFAkv79ksACgkQG7kqcTWJkGcmYgP+LsXxueY0XhhdxrNfsjpxa7h/
+74lGwBcUko6u2x2SZB3Xqa3ZN5477+owIQ7W741ovBNjTJ94WgySn4qWVuiqSpQn
+Wi9/InrTAO0q9HfkKvPUBUBhPwwM/FYd5PDfZ94uarfpnSZY5YOhOoZTrWulefqr
+Rg8fSfRocbodRnHKyLY=
+=H8xu
-----END PGP SIGNATURE-----
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100308.ebuild,v 1.3 2010/05/13 01:45:28 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100524.ebuild,v 1.1 2010/05/25 16:09:36 tommy Exp $
EAPI="2"
MODULE_NAMES="aufs(misc:${S})"
pkg_setup() {
- # uesd to allow merging of binpkg aufs2 on systems lacking kernel sources
- [ -n "$PKG_SETUP_HAS_ALREADY_BEEN_RAN" ] && return
+ # this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system
+ [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
get_version
kernel_is lt 2 6 27 && die "kernel too old"
- kernel_is gt 2 6 33 && die "kernel too new"
+ kernel_is gt 2 6 34 && die "kernel too new"
if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \
patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null ); then
fi
fi
linux-mod_pkg_setup
- export PKG_SETUP_HAS_ALREADY_BEEN_RAN=1
+ export PKG_SETUP_HAS_BEEN_RAN=1
}
src_prepare() {
sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die
fi
if use inotify; then
- sed -i "s:HINOTIFY =:HINOTIFY = y:g" config.mk || die
+ sed -i "s:HNOTIFY =:HNOTIFY = y:g" config.mk || die
fi
if use ramfs; then
sed -i "s:RAMFS =:RAMFS = y:g" config.mk || die
--- /dev/null
+aufs2 base patch for linux-2.6.27
+
+diff --git a/fs/namei.c b/fs/namei.c
+index 4ea63ed..2759ad4 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1241,7 +1241,7 @@ out:
+ * needs parent already locked. Doesn't follow mounts.
+ * SMP-safe.
+ */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ int err;
+
+@@ -1251,7 +1251,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
+ return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+
+-static int __lookup_one_len(const char *name, struct qstr *this,
++int __lookup_one_len(const char *name, struct qstr *this,
+ struct dentry *base, int len)
+ {
+ unsigned long hash;
+diff --git a/fs/splice.c b/fs/splice.c
+index a1e701c..409245a 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -887,8 +887,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+ * Attempt to initiate a splice from pipe to file.
+ */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+- loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags)
+ {
+ int ret;
+
+@@ -911,9 +911,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+ */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+- struct pipe_inode_info *pipe, size_t len,
+- unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags)
+ {
+ int ret;
+
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index 68f8c32..5522432 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -71,6 +71,9 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry
+ extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
+ extern void release_open_intent(struct nameidata *);
+
++extern struct dentry *lookup_hash(struct nameidata *nd);
++extern int __lookup_one_len(const char *name, struct qstr *this,
++ struct dentry *base, int len);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+ extern struct dentry *lookup_one_noperm(const char *, struct dentry *);
+
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 528dcb9..5123bc6 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -71,4 +71,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
+ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
+ splice_direct_actor *);
+
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags);
++
+ #endif
-aufs2 base patch for linux-2.6.
+aufs2 base patch for linux-2.6.31
diff --git a/fs/namei.c b/fs/namei.c
-index f3c5b27..dcedad1 100644
+index 1f13751..b49c2af 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1219,7 +1219,7 @@ out:
--- /dev/null
+aufs2 base patch for linux-2.6.34
+
+diff --git a/fs/namei.c b/fs/namei.c
+index b86b96f..c43d6b8 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1177,7 +1177,7 @@ out:
+ * needs parent already locked. Doesn't follow mounts.
+ * SMP-safe.
+ */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ int err;
+
+@@ -1187,7 +1187,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
+ return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+
+-static int __lookup_one_len(const char *name, struct qstr *this,
++int __lookup_one_len(const char *name, struct qstr *this,
+ struct dentry *base, int len)
+ {
+ unsigned long hash;
+diff --git a/fs/splice.c b/fs/splice.c
+index 9313b61..b9e871f 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1054,8 +1054,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+ * Attempt to initiate a splice from pipe to file.
+ */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+- loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags)
+ {
+ ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ loff_t *, size_t, unsigned int);
+@@ -1082,9 +1082,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+ */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+- struct pipe_inode_info *pipe, size_t len,
+- unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags)
+ {
+ ssize_t (*splice_read)(struct file *, loff_t *,
+ struct pipe_inode_info *, size_t, unsigned int);
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index 05b441d..91bc74e 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ int (*open)(struct inode *, struct file *));
+
++extern struct dentry *lookup_hash(struct nameidata *nd);
++extern int __lookup_one_len(const char *name, struct qstr *this,
++ struct dentry *base, int len);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+
+ extern int follow_down(struct path *);
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 18e7c7c..8393b5c 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
+ extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
+ splice_direct_actor *);
+
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags);
++
+ #endif
aufs2 standalone patch for linux-2.6.27
-diff --git a/fs/Kconfig b/fs/Kconfig
-index abccb5d..b987e5e 100644
---- a/fs/Kconfig
-+++ b/fs/Kconfig
-@@ -1539,6 +1539,8 @@ config UFS_DEBUG
- Y here. This will result in _many_ additional debugging messages to be
- written to the system log.
-
-+source "fs/aufs/Kconfig"
-+
- endmenu
-
- menuconfig NETWORK_FILESYSTEMS
-diff --git a/fs/Makefile b/fs/Makefile
-index a1482a5..aa51c5a 100644
---- a/fs/Makefile
-+++ b/fs/Makefile
-@@ -122,3 +122,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
- obj-$(CONFIG_DEBUG_FS) += debugfs/
- obj-$(CONFIG_OCFS2_FS) += ocfs2/
- obj-$(CONFIG_GFS2_FS) += gfs2/
-+obj-$(CONFIG_AUFS_FS) += aufs/
diff --git a/fs/namei.c b/fs/namei.c
-index 4ea63ed..b207821 100644
+index 2759ad4..b207821 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -354,6 +354,7 @@ int deny_write_access(struct file * file)
/**
* path_get - get a reference to a path
-@@ -1241,7 +1242,7 @@ out:
- * needs parent already locked. Doesn't follow mounts.
- * SMP-safe.
- */
--static struct dentry *lookup_hash(struct nameidata *nd)
-+struct dentry *lookup_hash(struct nameidata *nd)
- {
- int err;
-
-@@ -1250,8 +1251,9 @@ static struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1250,6 +1251,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
return ERR_PTR(err);
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
+EXPORT_SYMBOL(lookup_hash);
--static int __lookup_one_len(const char *name, struct qstr *this,
-+int __lookup_one_len(const char *name, struct qstr *this,
+ int __lookup_one_len(const char *name, struct qstr *this,
struct dentry *base, int len)
- {
- unsigned long hash;
-@@ -1272,6 +1274,7 @@ static int __lookup_one_len(const char *name, struct qstr *this,
+@@ -1272,6 +1274,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
this->hash = end_name_hash(hash);
return 0;
}
/**
* lookup_one_len - filesystem helper to lookup single pathname component
diff --git a/fs/namespace.c b/fs/namespace.c
-index 6e283c9..98f56b9 100644
+index 6e283c9..36030e8 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -37,6 +37,9 @@
+@@ -37,6 +37,7 @@
/* spinlock for vfsmount related operations, inplace of dcache_lock */
__cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);
-+#ifdef CONFIG_AUFS_EXPORT
+EXPORT_SYMBOL(vfsmount_lock);
-+#endif
static int event;
static DEFINE_IDA(mnt_id_ida);
static long do_sys_truncate(const char __user *pathname, loff_t length)
{
diff --git a/fs/splice.c b/fs/splice.c
-index a1e701c..48d7e72 100644
+index 409245a..48d7e72 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -887,8 +887,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
- /*
- * Attempt to initiate a splice from pipe to file.
- */
--static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-- loff_t *ppos, size_t len, unsigned int flags)
-+long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+ loff_t *ppos, size_t len, unsigned int flags)
- {
- int ret;
-
-@@ -907,13 +907,14 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -907,6 +907,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
return out->f_op->splice_write(pipe, out, ppos, len, flags);
}
/*
* Attempt to initiate a splice from a file to a pipe.
- */
--static long do_splice_to(struct file *in, loff_t *ppos,
-- struct pipe_inode_info *pipe, size_t len,
-- unsigned int flags)
-+long do_splice_to(struct file *in, loff_t *ppos,
-+ struct pipe_inode_info *pipe, size_t len,
-+ unsigned int flags)
- {
- int ret;
-
-@@ -929,6 +930,7 @@ static long do_splice_to(struct file *in, loff_t *ppos,
+@@ -929,6 +930,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return in->f_op->splice_read(in, ppos, pipe, len, flags);
}
/**
* splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/fs/super.c b/fs/super.c
-index e931ae9..141853c 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -270,6 +270,7 @@ int fsync_super(struct super_block *sb)
- __fsync_super(sb);
- return sync_blockdev(sb->s_bdev);
- }
-+EXPORT_SYMBOL(fsync_super);
-
- /**
- * generic_shutdown_super - common helper for ->kill_sb()
diff --git a/fs/sync.c b/fs/sync.c
index 2967562..34040d6 100644
--- a/fs/sync.c
static long __do_fsync(unsigned int fd, int datasync)
{
-diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index b68ec09..22d182c 100644
---- a/include/linux/Kbuild
-+++ b/include/linux/Kbuild
-@@ -34,6 +34,7 @@ header-y += atmppp.h
- header-y += atmsap.h
- header-y += atmsvc.h
- header-y += atm_zatm.h
-+header-y += aufs_type.h
- header-y += auto_fs4.h
- header-y += ax25.h
- header-y += b1lli.h
-diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
-index 331e5f1..606bf6e 100644
---- a/include/linux/lockdep.h
-+++ b/include/linux/lockdep.h
-@@ -58,7 +58,7 @@ enum lock_usage_bit
- #define LOCKF_USED_IN_IRQ_READ \
- (LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)
-
--#define MAX_LOCKDEP_SUBCLASSES 8UL
-+#define MAX_LOCKDEP_SUBCLASSES 12UL
+diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
+index 1d94160..34fda4a 100644
+--- a/kernel/mutex-debug.c
++++ b/kernel/mutex-debug.c
+@@ -30,6 +30,7 @@ void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
+ {
+ lock->owner = new_owner;
+ }
++EXPORT_SYMBOL(debug_mutex_set_owner);
- /*
- * Lock-classes are keyed via unique addresses, by embedding the
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index 68f8c32..5522432 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -71,6 +71,9 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry
- extern struct file *nameidata_to_filp(struct nameidata *nd, int flags);
- extern void release_open_intent(struct nameidata *);
-
-+extern struct dentry *lookup_hash(struct nameidata *nd);
-+extern int __lookup_one_len(const char *name, struct qstr *this,
-+ struct dentry *base, int len);
- extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
- extern struct dentry *lookup_one_noperm(const char *, struct dentry *);
-
-diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 528dcb9..5123bc6 100644
---- a/include/linux/splice.h
-+++ b/include/linux/splice.h
-@@ -71,4 +71,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
- extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
- splice_direct_actor *);
-
-+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
-+ loff_t *ppos, size_t len, unsigned int flags);
-+extern long do_splice_to(struct file *in, loff_t *ppos,
-+ struct pipe_inode_info *pipe, size_t len,
-+ unsigned int flags);
-+
- #endif
+ void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
+ {
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 46f2397..00ec611 100644
--- a/security/device_cgroup.c
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index 3a4b4f5..4d7882e 100644
+index 3a4b4f5..cd573d3 100644
--- a/security/security.c
+++ b/security/security.c
@@ -425,6 +425,7 @@ int security_inode_readlink(struct dentry *dentry)
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
+@@ -539,6 +541,7 @@ int security_file_permission(struct file *file, int mask)
+ {
+ return security_ops->file_permission(file, mask);
+ }
++EXPORT_SYMBOL(security_file_permission);
+
+ int security_file_alloc(struct file *file)
+ {
+@@ -561,6 +564,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ {
+ return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ unsigned long prot)
/**
* splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/fs/super.c b/fs/super.c
-index 400a760..a1df361 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -270,6 +270,7 @@ int fsync_super(struct super_block *sb)
- __fsync_super(sb);
- return sync_blockdev(sb->s_bdev);
- }
-+EXPORT_SYMBOL(fsync_super);
-
- /**
- * generic_shutdown_super - common helper for ->kill_sb()
diff --git a/fs/sync.c b/fs/sync.c
index 2967562..34040d6 100644
--- a/fs/sync.c
static long __do_fsync(unsigned int fd, int datasync)
{
+diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
+index 1d94160..34fda4a 100644
+--- a/kernel/mutex-debug.c
++++ b/kernel/mutex-debug.c
+@@ -30,6 +30,7 @@ void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
+ {
+ lock->owner = new_owner;
+ }
++EXPORT_SYMBOL(debug_mutex_set_owner);
+
+ void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
+ {
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 5ba7870..8f880c2 100644
--- a/security/device_cgroup.c
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index c0acfa7..812ebf4 100644
+index c0acfa7..8b1dadc 100644
--- a/security/security.c
+++ b/security/security.c
@@ -434,6 +434,7 @@ int security_inode_readlink(struct dentry *dentry)
int security_file_alloc(struct file *file)
{
+@@ -570,6 +573,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ {
+ return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ unsigned long prot)
/**
* splice_direct_to_actor - splices data directly between two non-pipes
-diff --git a/fs/super.c b/fs/super.c
-index 6ce5014..af66b69 100644
---- a/fs/super.c
-+++ b/fs/super.c
-@@ -287,6 +287,7 @@ int fsync_super(struct super_block *sb)
- __fsync_super(sb);
- return sync_blockdev(sb->s_bdev);
+diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
+index 1d94160..34fda4a 100644
+--- a/kernel/mutex-debug.c
++++ b/kernel/mutex-debug.c
+@@ -30,6 +30,7 @@ void debug_mutex_set_owner(struct mutex *lock, struct thread_info *new_owner)
+ {
+ lock->owner = new_owner;
}
-+EXPORT_SYMBOL(fsync_super);
++EXPORT_SYMBOL(debug_mutex_set_owner);
- /**
- * generic_shutdown_super - common helper for ->kill_sb()
+ void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter)
+ {
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 3aacd0f..b900dc3 100644
--- a/security/device_cgroup.c
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index c3586c0..9841a3e 100644
+index c3586c0..4f3a666 100644
--- a/security/security.c
+++ b/security/security.c
@@ -389,6 +389,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)
int security_file_alloc(struct file *file)
{
+@@ -642,6 +652,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ {
+ return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ unsigned long prot)
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index 5284255..ed62ecd 100644
+index 5284255..e419efc 100644
--- a/security/security.c
+++ b/security/security.c
@@ -389,6 +389,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)
int security_file_alloc(struct file *file)
{
+@@ -644,6 +654,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ {
+ return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ unsigned long prot)
--- /dev/null
+aufs2 standalone patch for linux-2.6.34
+
+diff --git a/fs/namei.c b/fs/namei.c
+index c43d6b8..538d40a 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -348,6 +348,7 @@ int deny_write_access(struct file * file)
+
+ return 0;
+ }
++EXPORT_SYMBOL(deny_write_access);
+
+ /**
+ * path_get - get a reference to a path
+@@ -1186,6 +1187,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+ return ERR_PTR(err);
+ return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
++EXPORT_SYMBOL(lookup_hash);
+
+ int __lookup_one_len(const char *name, struct qstr *this,
+ struct dentry *base, int len)
+@@ -1208,6 +1210,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
+ this->hash = end_name_hash(hash);
+ return 0;
+ }
++EXPORT_SYMBOL(__lookup_one_len);
+
+ /**
+ * lookup_one_len - filesystem helper to lookup single pathname component
+diff --git a/fs/namespace.c b/fs/namespace.c
+index f20cb57..7cc1b42 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1282,6 +1282,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ }
+ return 0;
+ }
++EXPORT_SYMBOL(iterate_mounts);
+
+ static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
+ {
+diff --git a/fs/notify/group.c b/fs/notify/group.c
+index 0e16771..3fab10a 100644
+--- a/fs/notify/group.c
++++ b/fs/notify/group.c
+@@ -22,6 +22,7 @@
+ #include <linux/srcu.h>
+ #include <linux/rculist.h>
+ #include <linux/wait.h>
++#include <linux/module.h>
+
+ #include <linux/fsnotify_backend.h>
+ #include "fsnotify.h"
+@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+ fsnotify_recalc_global_mask();
+ fsnotify_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_put_group);
+
+ /*
+ * Simply run the fsnotify_groups list and find a group which matches
+@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int group_num, __u32 mask,
+
+ return group;
+ }
++EXPORT_SYMBOL(fsnotify_obtain_group);
+diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
+index 0399bcb..74cdc13 100644
+--- a/fs/notify/inode_mark.c
++++ b/fs/notify/inode_mark.c
+@@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry)
+ if (atomic_dec_and_test(&entry->refcnt))
+ entry->free_mark(entry);
+ }
++EXPORT_SYMBOL(fsnotify_put_mark);
+
+ /*
+ * Recalculate the mask of events relevant to a given inode locked.
+@@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry)
+ if (unlikely(atomic_dec_and_test(&group->num_marks)))
+ fsnotify_final_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry);
+
+ /*
+ * Given a group, destroy all of the marks associated with that group.
+@@ -281,6 +283,7 @@ struct fsnotify_mark_entry *fsnotify_find_mark_entry(struct fsnotify_group *grou
+ }
+ return NULL;
+ }
++EXPORT_SYMBOL(fsnotify_find_mark_entry);
+
+ /*
+ * Nothing fancy, just initialize lists and locks and counters.
+@@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry,
+ entry->inode = NULL;
+ entry->free_mark = free_mark;
+ }
++EXPORT_SYMBOL(fsnotify_init_mark);
+
+ /*
+ * Attach an initialized mark entry to a given group and inode.
+@@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
+
+ return ret;
+ }
++EXPORT_SYMBOL(fsnotify_add_mark);
+
+ /**
+ * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes.
+diff --git a/fs/open.c b/fs/open.c
+index 74e5cd9..8192b46 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -225,6 +225,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+ mutex_unlock(&dentry->d_inode->i_mutex);
+ return ret;
+ }
++EXPORT_SYMBOL(do_truncate);
+
+ static long do_sys_truncate(const char __user *pathname, loff_t length)
+ {
+diff --git a/fs/splice.c b/fs/splice.c
+index b9e871f..b069be4 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1078,6 +1078,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+
+ return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_from);
+
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+@@ -1104,6 +1105,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+
+ return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_to);
+
+ /**
+ * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/security/commoncap.c b/security/commoncap.c
+index 6166973..a702444 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+ }
+ return ret;
+ }
++EXPORT_SYMBOL(cap_file_mmap);
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c
+index f77c604..743f39b 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -515,6 +515,7 @@ found:
+
+ return -EPERM;
+ }
++EXPORT_SYMBOL(devcgroup_inode_permission);
+
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff --git a/security/security.c b/security/security.c
+index 687c6fd..e9e5f6b 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -411,6 +411,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
+ return 0;
+ return security_ops->path_mkdir(dir, dentry, mode);
+ }
++EXPORT_SYMBOL(security_path_mkdir);
+
+ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ {
+@@ -418,6 +419,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ return 0;
+ return security_ops->path_rmdir(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_rmdir);
+
+ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ {
+@@ -425,6 +427,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ return 0;
+ return security_ops->path_unlink(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_unlink);
+
+ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ const char *old_name)
+@@ -433,6 +436,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ return 0;
+ return security_ops->path_symlink(dir, dentry, old_name);
+ }
++EXPORT_SYMBOL(security_path_symlink);
+
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ struct dentry *new_dentry)
+@@ -441,6 +445,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);
+ }
++EXPORT_SYMBOL(security_path_link);
+
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ struct path *new_dir, struct dentry *new_dentry)
+@@ -451,6 +456,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ return security_ops->path_rename(old_dir, old_dentry, new_dir,
+ new_dentry);
+ }
++EXPORT_SYMBOL(security_path_rename);
+
+ int security_path_truncate(struct path *path, loff_t length,
+ unsigned int time_attrs)
+@@ -459,6 +465,7 @@ int security_path_truncate(struct path *path, loff_t length,
+ return 0;
+ return security_ops->path_truncate(path, length, time_attrs);
+ }
++EXPORT_SYMBOL(security_path_truncate);
+
+ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ mode_t mode)
+@@ -467,6 +474,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ return 0;
+ return security_ops->path_chmod(dentry, mnt, mode);
+ }
++EXPORT_SYMBOL(security_path_chmod);
+
+ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ {
+@@ -474,6 +482,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ return 0;
+ return security_ops->path_chown(path, uid, gid);
+ }
++EXPORT_SYMBOL(security_path_chown);
+
+ int security_path_chroot(struct path *path)
+ {
+@@ -550,6 +559,7 @@ int security_inode_readlink(struct dentry *dentry)
+ return 0;
+ return security_ops->inode_readlink(dentry);
+ }
++EXPORT_SYMBOL(security_inode_readlink);
+
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+@@ -564,6 +574,7 @@ int security_inode_permission(struct inode *inode, int mask)
+ return 0;
+ return security_ops->inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(security_inode_permission);
+
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -664,6 +675,7 @@ int security_file_permission(struct file *file, int mask)
+ {
+ return security_ops->file_permission(file, mask);
+ }
++EXPORT_SYMBOL(security_file_permission);
+
+ int security_file_alloc(struct file *file)
+ {
+@@ -691,6 +703,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ return ret;
+ return ima_file_mmap(file, prot);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ unsigned long prot)
projects / gentoo.git / commitdiff