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

    Copy walk_component() into do_lookup().

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

    diff --git a/fs/namei.c b/fs/namei.c
    index 020a62f..46d4bf6 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2202,6 +2202,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
    int want_write = 0;
    int acc_mode = op->acc_mode;
    struct file *filp;
    + struct inode *inode;
    int error;

    nd->flags &= ~LOOKUP_PARENT;
    @@ -2239,12 +2240,36 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
    if (open_flag & O_PATH && !(nd->flags & LOOKUP_FOLLOW))
    symlink_ok = 1;
    /* we _can_ be in RCU mode here */
    - error = walk_component(nd, path, &nd->last, LAST_NORM,
    - !symlink_ok);
    - if (error < 0)
    - return ERR_PTR(error);
    - if (error) /* symlink */
    + error = lookup_fast(nd, &nd->last, path, &inode);
    + if (unlikely(error)) {
    + if (error < 0)
    + goto exit;
    +
    + error = lookup_slow(nd, &nd->last, path);
    + if (error < 0)
    + goto exit;
    +
    + inode = path->dentry->d_inode;
    + }
    + error = -ENOENT;
    + if (!inode) {
    + path_to_nameidata(path, nd);
    + goto exit;
    + }
    +
    + if (should_follow_link(inode, !symlink_ok)) {
    + if (nd->flags & LOOKUP_RCU) {
    + if (unlikely(unlazy_walk(nd, path->dentry))) {
    + error = -ECHILD;
    + goto exit;
    + }
    + }
    + BUG_ON(inode != path->dentry->d_inode);
    return NULL;
    + }
    + path_to_nameidata(path, nd);
    + nd->inode = inode;
    +
    /* sayonara */
    error = complete_walk(nd);
    if (error)
    --
    1.7.7


    \
     
     \ /
      Last update: 2012-04-25 14:49    [W:0.028 / U:0.124 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site