diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-30 20:13:15 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-31 22:03:16 +0200 |
| commit | acc9cb3cd425f479d8fc4a441bff45dce23aa6dd (patch) | |
| tree | 08ffc4b16ad2d00069189440dbfd4b893e2cc96e | |
| parent | untangling do_lookup() - expand the area under ->i_mutex (diff) | |
| download | linux-acc9cb3cd425f479d8fc4a441bff45dce23aa6dd.tar.xz linux-acc9cb3cd425f479d8fc4a441bff45dce23aa6dd.zip | |
untangling do_lookup() - eliminate a loop.
d_lookup() *will* fail after successful d_invalidate(), if we are
holding i_mutex all along. IOW, we don't need to jump back to
l: - we know what path will be taken there and can do that (i.e.
d_alloc_and_lookup()) directly.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c index 48fc0fb8c9d1..9ce43a358c33 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1173,7 +1173,6 @@ retry: BUG_ON(nd->inode != dir); mutex_lock(&dir->i_mutex); -l: dentry = d_lookup(parent, name); if (likely(!dentry)) { dentry = d_alloc_and_lookup(parent, name, nd); @@ -1204,9 +1203,14 @@ l: } if (!d_invalidate(dentry)) { dput(dentry); - dentry = NULL; - need_reval = 1; - goto l; + dentry = d_alloc_and_lookup(parent, name, nd); + if (IS_ERR(dentry)) { + mutex_unlock(&dir->i_mutex); + return PTR_ERR(dentry); + } + /* known good */ + need_reval = 0; + status = 1; } } mutex_unlock(&dir->i_mutex); |