KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic-2.6/2.6.30: more mini_fo fixes

Browse source 
SVN-Revision: 16346
This commit is contained in:
Gabor Juhos 2009-06-05 15:24:59 +00:00
parent 9fb98fc03c
commit 4af9570756
1 changed files with 51 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
target/linux/generic-2.6/patches-2.6.30/215-mini_fo_2.6.30.patch
View file

@ -51,6 +51,42 @@
/* catch error in lookup */ /* catch error in lookup */
if (IS_ERR(hidden_dentry) || IS_ERR(hidden_sto_dentry)) { 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 --- a/fs/mini_fo/meta.c
+++ b/fs/mini_fo/meta.c +++ b/fs/mini_fo/meta.c
@@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry) @@ -43,9 +43,11 @@ int meta_build_lists(dentry_t *dentry)
@ -91,22 +127,21 @@
if(!meta_dentry->d_inode) { if(!meta_dentry->d_inode) {
/* We need to create a META-file */ /* We need to create a META-file */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #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; goto out;
} }
} }
+ +
+ mutex_lock(&dtohd2(dentry)->d_inode->i_mutex); + mutex_lock(&dtohd2(dentry)->d_inode->i_mutex);
meta_dentry = lookup_one_len(META_FILENAME, meta_dentry = lookup_one_len(META_FILENAME,
dtohd2(dentry), dtohd2(dentry),
strlen(META_FILENAME)); strlen(META_FILENAME));
+ mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex); + mutex_unlock(&dtohd2(dentry)->d_inode->i_mutex);
+ +
+ if(!meta_dentry->d_inode) {
if(!meta_dentry->d_inode) { /* We need to create a META-file */
/* We need to create a META-file */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) @@ -784,9 +797,13 @@ int meta_sync_r_list(dentry_t *dentry, i
@@ -784,9 +798,13 @@ int meta_sync_r_list(dentry_t *dentry, i
goto out; goto out;
} }
} }