lkml.org 
[lkml]   [2007]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 03/10] Remove path_release_on_umount()
    path_release_on_umount() should only be called from sys_umount(). I merged the
    function into sys_umount() instead of having in in namei.c.

    Signed-off-by: Jan Blunck <jblunck@suse.de>
    Acked-by: Christoph Hellwig <hch@lst.de>
    ---
    fs/namei.c | 10 ----------
    fs/namespace.c | 4 +++-
    include/linux/namei.h | 1 -
    3 files changed, 3 insertions(+), 12 deletions(-)

    Index: b/fs/namei.c
    ===================================================================
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -368,16 +368,6 @@ void path_release(struct nameidata *nd)
    mntput(nd->mnt);
    }

    -/*
    - * umount() mustn't call path_release()/mntput() as that would clear
    - * mnt_expiry_mark
    - */
    -void path_release_on_umount(struct nameidata *nd)
    -{
    - dput(nd->dentry);
    - mntput_no_expire(nd->mnt);
    -}
    -
    /**
    * release_open_intent - free up open intent resources
    * @nd: pointer to nameidata
    Index: b/fs/namespace.c
    ===================================================================
    --- a/fs/namespace.c
    +++ b/fs/namespace.c
    @@ -988,7 +988,9 @@ asmlinkage long sys_umount(char __user *

    retval = do_umount(nd.mnt, flags);
    dput_and_out:
    - path_release_on_umount(&nd);
    + /* we mustn't call path_put() as that would clear mnt_expiry_mark */
    + dput(nd.dentry);
    + mntput_no_expire(nd.mnt);
    out:
    return retval;
    }
    Index: b/include/linux/namei.h
    ===================================================================
    --- a/include/linux/namei.h
    +++ b/include/linux/namei.h
    @@ -73,7 +73,6 @@ extern int FASTCALL(path_lookup(const ch
    extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
    const char *, unsigned int, struct nameidata *);
    extern void path_release(struct nameidata *);
    -extern void path_release_on_umount(struct nameidata *);

    extern int __user_path_lookup_open(const char __user *, unsigned lookup_flags, struct nameidata *nd, int open_flags);
    extern int path_lookup_open(int dfd, const char *name, unsigned lookup_flags, struct nameidata *, int open_flags);
    --

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

    \
     
     \ /
      Last update: 2007-10-09 20:11    [W:0.021 / U:32.180 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site