summaryrefslogtreecommitdiffstats
path: root/abs/core/aufs2/aufs2-module-2.6.36.patch
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-11-06 18:40:01 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-11-06 18:40:01 (GMT)
commit9b3aa8f5352ccdb0131237913b7783d2d4653cef (patch)
tree85a4a141b79faac5fca0afb0cef503cd4816c168 /abs/core/aufs2/aufs2-module-2.6.36.patch
parenta88e0a4caaee4269707417416f8e36c754ea6e16 (diff)
downloadlinhes_pkgbuild-9b3aa8f5352ccdb0131237913b7783d2d4653cef.zip
linhes_pkgbuild-9b3aa8f5352ccdb0131237913b7783d2d4653cef.tar.gz
linhes_pkgbuild-9b3aa8f5352ccdb0131237913b7783d2d4653cef.tar.bz2
aufs2: updated for new kernel 2.6.26
ref # 574 ref # 647
Diffstat (limited to 'abs/core/aufs2/aufs2-module-2.6.36.patch')
-rw-r--r--abs/core/aufs2/aufs2-module-2.6.36.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/abs/core/aufs2/aufs2-module-2.6.36.patch b/abs/core/aufs2/aufs2-module-2.6.36.patch
new file mode 100644
index 0000000..3b43f7a
--- /dev/null
+++ b/abs/core/aufs2/aufs2-module-2.6.36.patch
@@ -0,0 +1,47 @@
+diff --git a/ubuntu/aufs/branch.c b/ubuntu/aufs/branch.c
+index cd4463c..ff6b158 100644
+--- a/fs/aufs/branch.c
++++ b/fs/aufs/branch.c
+@@ -22,6 +22,8 @@
+
+ #include <linux/file.h>
+ #include <linux/statfs.h>
++#include <linux/lglock.h>
++#include <linux/percpu.h>
+ #include "aufs.h"
+
+ /*
+@@ -851,7 +853,8 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
+ goto out;
+
+ /* no need file_list_lock() since sbinfo is locked? defered? */
+- list_for_each_entry(file, &sb->s_files, f_u.fu_list) {
++ lg_global_lock(files_lglock);
++ do_file_list_for_each_entry(sb, file) {
+ if (special_file(file->f_dentry->d_inode->i_mode))
+ continue;
+
+@@ -861,6 +864,7 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
+ err = -EBUSY;
+ FiMustNoWaiters(file);
+ fi_read_unlock(file);
++ lg_global_unlock(files_lglock);
+ goto out_free;
+ }
+
+@@ -889,10 +893,13 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex)
+ if (p) {
+ a = p;
+ a[n++] = hf;
+- } else
++ } else {
++ lg_global_unlock(files_lglock);
+ goto out_free;
++ }
+ }
+- }
++ } while_file_list_for_each_entry;
++ lg_global_unlock(files_lglock);
+
+ err = 0;
+ if (n)