diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-07 00:46:34 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-07 00:46:34 -0400 |
commit | 619b8d955269f2fe74386e98fac07675c8b55352 (patch) | |
tree | f3e2610a39c99a7e43bc2b345280b04e398b986a /kernels/aufs2-libre/aufs2-module-2.6.36.patch | |
parent | 2b04539ac9310541a4e563460aed0cb7715770d2 (diff) | |
parent | 7d4e98b2d6f2fd4d42ebb55105bab8a05e34ab94 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'kernels/aufs2-libre/aufs2-module-2.6.36.patch')
-rw-r--r-- | kernels/aufs2-libre/aufs2-module-2.6.36.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/kernels/aufs2-libre/aufs2-module-2.6.36.patch b/kernels/aufs2-libre/aufs2-module-2.6.36.patch deleted file mode 100644 index 3b43f7aed..000000000 --- a/kernels/aufs2-libre/aufs2-module-2.6.36.patch +++ /dev/null @@ -1,47 +0,0 @@ -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) |