diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-03-12 12:38:40 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-03-12 12:38:40 -0300 |
commit | da3e14b1c0836ab3facc47d4645942d92b2f4760 (patch) | |
tree | 2064d6087d6fadd8b4969a77fbf1e7d70b760733 /kernels/aufs2-libre/aufs2-module-2.6.36.patch | |
parent | d3e5d228125973838465eef2a151c89044f9e7f8 (diff) | |
parent | 2a5aebb2f7996f804dcf8355e86ae72010b42b9a (diff) | |
download | abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.tar.gz abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.tar.bz2 abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.zip |
Merge branch 'master' of ssh://gparabola/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, 47 insertions, 0 deletions
diff --git a/kernels/aufs2-libre/aufs2-module-2.6.36.patch b/kernels/aufs2-libre/aufs2-module-2.6.36.patch new file mode 100644 index 000000000..3b43f7aed --- /dev/null +++ b/kernels/aufs2-libre/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) |