leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

untangling do_lookup() - expand the area under ->i_mutex

Browse Source 
keep holding ->i_mutex over revalidation parts

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-03-30 14:08:28 -04:00
parent 3f6c7c71a2
commit 37c17e1f37
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/namei.c
View File

@ -1173,6 +1173,7 @@ retry:
BUG_ON(nd->inode != dir); BUG_ON(nd->inode != dir);
mutex_lock(&dir->i_mutex); mutex_lock(&dir->i_mutex);
l:
dentry = d_lookup(parent, name); dentry = d_lookup(parent, name);
if (likely(!dentry)) { if (likely(!dentry)) {
dentry = d_alloc_and_lookup(parent, name, nd); dentry = d_alloc_and_lookup(parent, name, nd);
@ -1193,11 +1194,11 @@ retry:
need_reval = 0; need_reval = 0;
status = 1; status = 1;
} }
mutex_unlock(&dir->i_mutex);
if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval) if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval)
status = d_revalidate(dentry, nd); status = d_revalidate(dentry, nd);
if (unlikely(status <= 0)) { if (unlikely(status <= 0)) {
if (status < 0) { if (status < 0) {
mutex_unlock(&dir->i_mutex);
dput(dentry); dput(dentry);
return status; return status;
} }
@ -1205,9 +1206,10 @@ retry:
dput(dentry); dput(dentry);
dentry = NULL; dentry = NULL;
need_reval = 1; need_reval = 1;
goto retry; goto l;
} }
} }
mutex_unlock(&dir->i_mutex);
goto done; goto done;
} }
if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval) if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE) && need_reval)