diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-01-17 22:52:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-01-17 22:52:24 +0000 |
| commit | c15a8f3b93ff582af0e3d55490f27eadebd648b2 (patch) | |
| tree | 8ec93b7f8e303c7606f2451625918b15795841b0 | |
| parent | d2229cb1cc7f0d58b976bf6bac2eedcc9eb6ed97 (diff) | |
| download | upstream-c15a8f3b93ff582af0e3d55490f27eadebd648b2.tar.gz upstream-c15a8f3b93ff582af0e3d55490f27eadebd648b2.tar.bz2 upstream-c15a8f3b93ff582af0e3d55490f27eadebd648b2.zip | |
add mini_fo locking fix from #5864
SVN-Revision: 19203
3 files changed, 75 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.30/216-mini_fo_locking.patch new file mode 100644 index 0000000000..4f075920fb --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.30/216-mini_fo_locking.patch @@ -0,0 +1,25 @@ +--- a/fs/mini_fo/state.c ++++ b/fs/mini_fo/state.c +@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry) + dtohd(dentry) = NULL; + dtost(dentry) = DELETED; + +- /* add deleted file to META-file */ +- meta_add_d_entry(dentry->d_parent, +- dentry->d_name.name, +- dentry->d_name.len); +- + /* was: unlock_dir(hidden_sto_dir_dentry); */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) + mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex); + #else + up(&hidden_sto_dir_dentry->d_inode->i_sem); + #endif ++ /* add deleted file to META-file */ ++ meta_add_d_entry(dentry->d_parent, ++ dentry->d_name.name, ++ dentry->d_name.len); ++ + dput(hidden_sto_dir_dentry); + + out: diff --git a/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch new file mode 100644 index 0000000000..4f075920fb --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.31/216-mini_fo_locking.patch @@ -0,0 +1,25 @@ +--- a/fs/mini_fo/state.c ++++ b/fs/mini_fo/state.c +@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry) + dtohd(dentry) = NULL; + dtost(dentry) = DELETED; + +- /* add deleted file to META-file */ +- meta_add_d_entry(dentry->d_parent, +- dentry->d_name.name, +- dentry->d_name.len); +- + /* was: unlock_dir(hidden_sto_dir_dentry); */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) + mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex); + #else + up(&hidden_sto_dir_dentry->d_inode->i_sem); + #endif ++ /* add deleted file to META-file */ ++ meta_add_d_entry(dentry->d_parent, ++ dentry->d_name.name, ++ dentry->d_name.len); ++ + dput(hidden_sto_dir_dentry); + + out: diff --git a/target/linux/generic-2.6/patches-2.6.32/216-mini_fo_locking.patch b/target/linux/generic-2.6/patches-2.6.32/216-mini_fo_locking.patch new file mode 100644 index 0000000000..4f075920fb --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.32/216-mini_fo_locking.patch @@ -0,0 +1,25 @@ +--- a/fs/mini_fo/state.c ++++ b/fs/mini_fo/state.c +@@ -537,17 +537,17 @@ int nondir_mod_to_del(dentry_t *dentry) + dtohd(dentry) = NULL; + dtost(dentry) = DELETED; + +- /* add deleted file to META-file */ +- meta_add_d_entry(dentry->d_parent, +- dentry->d_name.name, +- dentry->d_name.len); +- + /* was: unlock_dir(hidden_sto_dir_dentry); */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) + mutex_unlock(&hidden_sto_dir_dentry->d_inode->i_mutex); + #else + up(&hidden_sto_dir_dentry->d_inode->i_sem); + #endif ++ /* add deleted file to META-file */ ++ meta_add_d_entry(dentry->d_parent, ++ dentry->d_name.name, ++ dentry->d_name.len); ++ + dput(hidden_sto_dir_dentry); + + out: |