add mini_fo locking fix from #5864

SVN-Revision: 19203
15 years ago · c15a8f3b93
parent d2229cb1cc
commit c15a8f3b93
3 changed files with 75 additions and 0 deletions
--- 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
@ -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:
--- 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
@ -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:
--- 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
@ -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: