vfs: clean up real_lookup()
PATCH 8/9 vfs: clean up real_lookup()
From: Sage Weil <[email protected]>
Get rid of the goto by flipping the if (!result) over. Make the comments a bit more descriptive. Fix a few kernel style problems. No functional changes.
Cc Ian Kent <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Al Viro <[email protected]>
Cc Andreas Dilger <[email protected]>
Signed-off-by Yehuda Sadeh <[email protected]>
Signed-off-by Sage Weil <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/namei.c | 65 ++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 31 deletions(-)
fs/namei.c renamed from fs/namei.c~vfs-clean-up-real_lookup +34 -31
@@ -469,19 +469,20 @@ ok:* This is called when everything else fails, and we actually have * to go to the low-level filesystem to find out what we should do.. * -* We get the directory semaphore, and after getting that we also +* We get the directory mutex, and after getting that we also * make sure that nobody added the entry to the dcache in the meantime.. * SMP-safe */ -static struct dentry *real_lookup (struct dentry * parent,struct qstr * name,struct nameidata *nd) +static struct dentry *real_lookup (struct dentry *parent,struct qstr *name, +struct nameidata *nd) { -struct dentry * result; +struct dentry *result, *dentry;struct inode *dir = parent->d_inode;mutex_lock (&dir->i_mutex);/* * First re-do the cached lookup just in case it was created -* while we waited for the directory semaphore.. +* while we waited for the directory mutex. * * FIXME! This could use version numbering or similar to * avoid unnecessary cache lookups.
@@ -494,38 +495,40 @@ static struct dentry * real_lookup(struc* so doing d_lookup() (with seqlock), instead of lockfree __d_lookup */ result =d_lookup (parent, name); -if (!result) { -struct dentry *dentry; - -do_the_lookup: -/* Don't create child dentry for a dead directory. */ - result =ERR_PTR (-ENOENT ); -if (IS_DEADDIR (dir)) - goto out_unlock; - - dentry =d_alloc (parent, name); - result =ERR_PTR (-ENOMEM ); -if (dentry) { - result = dir->i_op->lookup (dir, dentry, nd); +if (result) { +/* +* The cache was re-populated while we waited on the +* mutex. We need to revalidate, this time while +* holding i_mutex (to avoid another race). +*/ +if (result->d_op && result->d_op->d_revalidate) { + result =do_revalidate (result, nd);if (result) -dput (dentry); -else - result = dentry; + goto out_unlock; +/* +* The dentry was left behind invalid. Just +* do the lookup. +*/ + }else { + goto out_unlock; } -out_unlock: -mutex_unlock (&dir->i_mutex); -return result; } -/* -* Uhhuh! Nasty case: the cache was re-populated while -* we waited on the semaphore. Need to revalidate. -*/ -if (result->d_op && result->d_op->d_revalidate) { - result =do_revalidate (result, nd); -if (!result) - goto do_the_lookup; +/* Don't create child dentry for a dead directory. */ + result =ERR_PTR (-ENOENT ); +if (IS_DEADDIR (dir)) + goto out_unlock; + + dentry =d_alloc (parent, name); + result =ERR_PTR (-ENOMEM ); +if (dentry) { + result = dir->i_op->lookup (dir, dentry, nd); +if (result) +dput (dentry); +else + result = dentry; } +out_unlock:mutex_unlock (&dir->i_mutex);return result; }
_
Quoted 6 lines · On Tue, 17 Nov 2009, [email protected] wrote:
From: Sage Weil <[email protected]>
Get rid of the goto by flipping the if (!result) over. Make the comments a bit more descriptive. Fix a few kernel style problems. No functional changes.
Quoted 7 lines
Cc Ian Kent <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Al Viro <[email protected]>Cc Andreas Dilger <[email protected]>Signed-off-by Yehuda Sadeh <[email protected]>Signed-off-by Sage Weil <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Acked-by Miklos Szeredi <[email protected]>