lkml.org 
[lkml]   [2010]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/6] Remove the automount through follow_link() kludge code from pathwalk
    Date
    Remove the automount through follow_link() kludge code from pathwalk in favour
    of using d_automount().

    Signed-off-by: David Howells <dhowells@redhat.com>
    ---

    fs/namei.c | 17 +++--------------
    1 files changed, 3 insertions(+), 14 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index fcec3c6..86068a2 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -845,17 +845,6 @@ fail:
    }

    /*
    - * This is a temporary kludge to deal with "automount" symlinks; proper
    - * solution is to trigger them on follow_mount(), so that do_lookup()
    - * would DTRT. To be killed before 2.6.34-final.
    - */
    -static inline int follow_on_final(struct inode *inode, unsigned lookup_flags)
    -{
    - return inode && unlikely(inode->i_op->follow_link) &&
    - ((lookup_flags & LOOKUP_FOLLOW) || S_ISDIR(inode->i_mode));
    -}
    -
    -/*
    * Name resolution.
    * This is the basic name resolution function, turning a pathname into
    * the final dentry. We expect 'base' to be positive and a directory.
    @@ -975,7 +964,8 @@ last_component:
    if (err)
    break;
    inode = next.dentry->d_inode;
    - if (follow_on_final(inode, lookup_flags)) {
    + if (inode && unlikely(inode->i_op->follow_link) &&
    + (lookup_flags & LOOKUP_FOLLOW)) {
    err = do_follow_link(&next, nd);
    if (err)
    goto return_err;
    @@ -1888,8 +1878,7 @@ reval:
    struct inode *inode = path.dentry->d_inode;
    void *cookie;
    error = -ELOOP;
    - /* S_ISDIR part is a temporary automount kludge */
    - if (!(nd.flags & LOOKUP_FOLLOW) && !S_ISDIR(inode->i_mode))
    + if (!(nd.flags & LOOKUP_FOLLOW))
    goto exit_dput;
    if (count++ == 32)
    goto exit_dput;


    \
     
     \ /
      Last update: 2010-07-22 20:03    [W:0.036 / U:1.840 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site