[PATCH 01/21] vfs: do_last(): inline lookup_slow()

From: Miklos Szeredi
Date: Tue Jun 05 2012 - 09:10:10 EST


From: Miklos Szeredi <mszeredi@xxxxxxx>

Copy lookup_slow() into do_last().

Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxx>
---
fs/namei.c | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 7d69419..d6e8c55 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2245,9 +2245,22 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
if (error < 0)
goto exit;

- error = lookup_slow(nd, &nd->last, path);
- if (error < 0)
+ BUG_ON(nd->inode != dir->d_inode);
+
+ mutex_lock(&dir->d_inode->i_mutex);
+ dentry = __lookup_hash(&nd->last, dir, nd);
+ mutex_unlock(&dir->d_inode->i_mutex);
+ error = PTR_ERR(dentry);
+ if (IS_ERR(dentry))
goto exit;
+ path->mnt = nd->path.mnt;
+ path->dentry = dentry;
+ error = follow_managed(path, nd->flags);
+ if (unlikely(error < 0))
+ goto exit_dput;
+
+ if (error)
+ nd->flags |= LOOKUP_JUMPED;

inode = path->dentry->d_inode;
}
--
1.7.7

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/