lkml.org 
[lkml]   [2012]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 17/34] vfs: do_last(): inline lookup_slow()
Date
From: Miklos Szeredi <mszeredi@suse.cz>

Copy lookup_slow() into do_last().

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

diff --git a/fs/namei.c b/fs/namei.c
index c8a8b28..47bff57 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2276,9 +2276,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


\
 
 \ /
  Last update: 2012-04-05 17:05    [W:0.022 / U:0.064 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site