summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2010-12-01 17:35:07 +0000
committerThomas Sachau <tommy@gentoo.org>2010-12-01 17:35:07 +0000
commitb04d8074f61b5093bc788014786b2bdc186b26d3 (patch)
tree37941a68a25d77741890502a8abb07a923a39351 /sys-fs/aufs2
parentVersion bump. (diff)
downloadgentoo-2-b04d8074f61b5093bc788014786b2bdc186b26d3.tar.gz
gentoo-2-b04d8074f61b5093bc788014786b2bdc186b26d3.tar.bz2
gentoo-2-b04d8074f61b5093bc788014786b2bdc186b26d3.zip
Update patches for kernel 2.6.35
(Portage version: 2.2.0_alpha6-r1/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/aufs2')
-rw-r--r--sys-fs/aufs2/ChangeLog6
-rw-r--r--sys-fs/aufs2/files/aufs2-base-35.patch2
-rw-r--r--sys-fs/aufs2/files/aufs2-standalone-35.patch46
3 files changed, 49 insertions, 5 deletions
diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index 1e2c547b0bd2..859fbe1fdc05 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,10 @@
# 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.28 2010/11/30 21:25:04 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.29 2010/12/01 17:35:07 tommy Exp $
+
+ 01 Dec 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ files/aufs2-base-35.patch, files/aufs2-standalone-35.patch:
+ Update patches for kernel 2.6.35
*aufs2-0_p20101122 (30 Nov 2010)
diff --git a/sys-fs/aufs2/files/aufs2-base-35.patch b/sys-fs/aufs2/files/aufs2-base-35.patch
index d90958dc45a6..5766a7a656ef 100644
--- a/sys-fs/aufs2/files/aufs2-base-35.patch
+++ b/sys-fs/aufs2/files/aufs2-base-35.patch
@@ -1,4 +1,4 @@
-aufs2 base patch for linux-2.6.35
+aufs2.1 base patch for linux-2.6.35
diff --git a/fs/namei.c b/fs/namei.c
index 868d0cb..6e92c81 100644
diff --git a/sys-fs/aufs2/files/aufs2-standalone-35.patch b/sys-fs/aufs2/files/aufs2-standalone-35.patch
index e1ae93d5f207..5cda86a5f1e3 100644
--- a/sys-fs/aufs2/files/aufs2-standalone-35.patch
+++ b/sys-fs/aufs2/files/aufs2-standalone-35.patch
@@ -1,5 +1,37 @@
-aufs2 standalone patch for linux-2.6.35
+aufs2.1 standalone patch for linux-2.6.35
+diff --git a/fs/file_table.c b/fs/file_table.c
+index 5c7d10e..9031acf 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -34,6 +34,7 @@ struct files_stat_struct files_stat = {
+
+ /* public. Not pretty! */
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(files_lock);
++EXPORT_SYMBOL(files_lock);
+
+ /* SLAB cache for file structures */
+ static struct kmem_cache *filp_cachep __read_mostly;
+@@ -346,6 +347,7 @@ void file_kill(struct file *file)
+ file_list_unlock();
+ }
+ }
++EXPORT_SYMBOL(file_kill);
+
+ int fs_may_remount_ro(struct super_block *sb)
+ {
+diff --git a/fs/inode.c b/fs/inode.c
+index 722860b..bfb0698 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -84,6 +84,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
+ * the i_state of an inode while it is in use..
+ */
+ DEFINE_SPINLOCK(inode_lock);
++EXPORT_SYMBOL(inode_lock);
+
+ /*
+ * iprune_sem provides exclusion between the kswapd or try_to_free_pages
diff --git a/fs/namei.c b/fs/namei.c
index 6e92c81..334130e 100644
--- a/fs/namei.c
@@ -29,10 +61,18 @@ index 6e92c81..334130e 100644
/**
* lookup_one_len - filesystem helper to lookup single pathname component
diff --git a/fs/namespace.c b/fs/namespace.c
-index 88058de..397afcc 100644
+index 88058de..6e39b69 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1279,6 +1279,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -39,6 +39,7 @@
+
+ /* spinlock for vfsmount related operations, inplace of dcache_lock */
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(vfsmount_lock);
++EXPORT_SYMBOL(vfsmount_lock);
+
+ static int event;
+ static DEFINE_IDA(mnt_id_ida);
+@@ -1279,6 +1280,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}