add mini_fo locking fix from #5864
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19203 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
325e935158
commit
dbce930b77
|
@ -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:
|
|
@ -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:
|
|
@ -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:
|
Loading…
Reference in New Issue