diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-02 12:37:23 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-02 12:37:23 -0300 |
| commit | 0d1bceb53656f5976e84fd7a1b31e1ca57b0b0cc (patch) | |
| tree | 0a2165fb84946b0cd1a702cb69913f061b80ab0b /libre/aufs2-libre/aufs2-module-2.6.36.patch | |
| parent | 89427cd345dd9778ff930861b51ead9801adec70 (diff) | |
| parent | 14ba37eac0c2414ff3a9f66ff6ca709e23ae7917 (diff) | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
Diffstat (limited to 'libre/aufs2-libre/aufs2-module-2.6.36.patch')
| -rw-r--r-- | libre/aufs2-libre/aufs2-module-2.6.36.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/libre/aufs2-libre/aufs2-module-2.6.36.patch b/libre/aufs2-libre/aufs2-module-2.6.36.patch new file mode 100644 index 000000000..3b43f7aed --- /dev/null +++ b/libre/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) |