summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-05 15:24:59 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-06-05 15:24:59 +0000
commit88ce24799a4511ded5f800a636445ff0e2d91a27 (patch)
tree2f44da20fa595b78bd768babaa5b3687282559a8 /target
parent866728dbb1cde99b4163c3c6e0a7d2138eba9b5a (diff)
[kernel] generic-2.6/2.6.30: more mini_fo fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16346 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch41
1 files changed, 38 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch b/target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch
index ca122d9fa..2d2092061 100644
--- a/target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch
@@ -51,6 +51,42 @@
/* catch error in lookup */
if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) {
+@@ -553,9 +559,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
+ #endif
+
+ /* Delete an old WOL file contained in the storage dir */
++ mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,
+ strlen(META_FILENAME));
++ mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
+ if(meta_dentry->d_inode) {
+ err = vfs_unlink(hidden_sto_dentry->d_inode, meta_dentry);
+ dput(meta_dentry);
+@@ -643,9 +651,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
+ #endif
+
+ /* Delete an old WOL file contained in the storage dir */
++ mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,
+ strlen(META_FILENAME));
++ mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
+ if(meta_dentry->d_inode) {
+ /* is this necessary? dget(meta_dentry); */
+ err = vfs_unlink(hidden_sto_dentry->d_inode,
+@@ -688,9 +698,11 @@ mini_fo_rmdir(inode_t *dir, dentry_t *de
+ #endif
+
+ /* Delete an old WOL file contained in the storage dir */
++ mutex_lock(&hidden_sto_dentry->d_inode->i_mutex);
+ meta_dentry = lookup_one_len(META_FILENAME,
+ hidden_sto_dentry,
+ strlen(META_FILENAME));
++ mutex_unlock(&hidden_sto_dentry->d_inode->i_mutex);
+ if(meta_dentry->d_inode) {
+ /* is this necessary? dget(meta_dentry); */
+ err = vfs_unlink(hidden_sto_dentry->d_inode,
--- a/fs/mini_fo/meta.c
+++ b/fs/mini_fo/meta.c
@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
@@ -91,7 +127,7 @@
if(!meta_dentry->d_inode) {
/* We need to create a META-file */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -641,9 +650,14 @@ int meta_sync_d_list(dentry_t *dentry, i
+@@ -641,9 +650,13 @@ int meta_sync_d_list(dentry_t *dentry, i
goto out;
}
}
@@ -102,11 +138,10 @@
strlen(META_FILENAME));
+ mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
+
-+
if(!meta_dentry->d_inode) {
/* We need to create a META-file */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-@@ -784,9 +798,13 @@ int meta_sync_r_list(dentry_t *dentry, i
+@@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
goto out;
}
}