lkml.org 
[lkml]   [2009]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] autofs4 - renamer unhashed to active in autofs4_lookup()
    Date
    Rename the variable unhashed to active in autofs4_lookup() to
    better reflect its usage.

    Signed-off-by: Ian Kent <raven@themaw.net>
    ---

    fs/autofs4/root.c | 20 ++++++++++----------
    1 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
    index 305136b..961ff37 100644
    --- a/fs/autofs4/root.c
    +++ b/fs/autofs4/root.c
    @@ -514,7 +514,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
    {
    struct autofs_sb_info *sbi;
    struct autofs_info *ino;
    - struct dentry *expiring, *unhashed;
    + struct dentry *expiring, *active;
    int oz_mode;

    DPRINTK("name = %.*s",
    @@ -530,9 +530,9 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
    DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",
    current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode);

    - unhashed = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name);
    - if (unhashed) {
    - dentry = unhashed;
    + active = autofs4_lookup_active(sbi, dentry->d_parent, &dentry->d_name);
    + if (active) {
    + dentry = active;
    ino = autofs4_dentry_ino(dentry);
    } else {
    /*
    @@ -600,8 +600,8 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
    if (sigismember (sigset, SIGKILL) ||
    sigismember (sigset, SIGQUIT) ||
    sigismember (sigset, SIGINT)) {
    - if (unhashed)
    - dput(unhashed);
    + if (active)
    + dput(active);
    return ERR_PTR(-ERESTARTNOINTR);
    }
    }
    @@ -633,14 +633,14 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
    else
    dentry = ERR_PTR(-ENOENT);

    - if (unhashed)
    - dput(unhashed);
    + if (active)
    + dput(active);

    return dentry;
    }

    - if (unhashed)
    - return unhashed;
    + if (active)
    + return active;

    return NULL;
    }


    \
     
     \ /
      Last update: 2009-10-01 03:05    [W:0.021 / U:0.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site