lkml.org 
[lkml]   [2009]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/32] whiteout: Add path_whiteout() helper
    Date
    Add a path_whiteout() helper for vfs_whiteout().

    Signed-off-by: Jan Blunck <jblunck@suse.org>
    Signed-off-by: Valerie Aurora (Henson) <vaurora@redhat.com>
    ---
    fs/namei.c | 15 ++++++++++++++-
    include/linux/fs.h | 1 -
    2 files changed, 14 insertions(+), 2 deletions(-)

    diff --git a/fs/namei.c b/fs/namei.c
    index fe58172..9dc51b0 100644
    --- a/fs/namei.c
    +++ b/fs/namei.c
    @@ -2172,7 +2172,7 @@ static inline int may_whiteout(struct inode *dir, struct dentry *victim,
    * After this returns with success, don't make any assumptions about the inode.
    * Just dput() it dentry.
    */
    -int vfs_whiteout(struct inode *dir, struct dentry *dentry, int isdir)
    +static int vfs_whiteout(struct inode *dir, struct dentry *dentry, int isdir)
    {
    int err;
    struct inode *old_inode = dentry->d_inode;
    @@ -2224,6 +2224,19 @@ int vfs_whiteout(struct inode *dir, struct dentry *dentry, int isdir)
    return err;
    }

    +int path_whiteout(struct path *dir_path, struct dentry *dentry, int isdir)
    +{
    + int error = mnt_want_write(dir_path->mnt);
    +
    + if (!error) {
    + error = vfs_whiteout(dir_path->dentry->d_inode, dentry, isdir);
    + mnt_drop_write(dir_path->mnt);
    + }
    +
    + return error;
    +}
    +EXPORT_SYMBOL(path_whiteout);
    +
    /*
    * We try to drop the dentry early: we should have
    * a usage count of 2 if we're the only user of this
    diff --git a/include/linux/fs.h b/include/linux/fs.h
    index 841bc1d..f5ca398 100644
    --- a/include/linux/fs.h
    +++ b/include/linux/fs.h
    @@ -1245,7 +1245,6 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
    extern int vfs_rmdir(struct inode *, struct dentry *);
    extern int vfs_unlink(struct inode *, struct dentry *);
    extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
    -extern int vfs_whiteout(struct inode *, struct dentry *, int);

    /*
    * VFS dentry helper functions.
    --
    1.6.1.3


    \
     
     \ /
      Last update: 2009-05-18 18:25    [W:0.021 / U:2.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site