lkml.org 
[lkml]   [2009]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 1/4] nfs: remove unnecessary check from nfs_rename()
    From: Miklos Szeredi <mszeredi@suse.cz>

    VFS already checks if both source and target are directories.

    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    ---
    fs/nfs/dir.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    Index: linux-2.6/fs/nfs/dir.c
    ===================================================================
    --- linux-2.6.orig/fs/nfs/dir.c 2009-12-02 13:46:12.000000000 +0100
    +++ linux-2.6/fs/nfs/dir.c 2009-12-02 15:10:33.000000000 +0100
    @@ -1601,13 +1601,8 @@ static int nfs_rename(struct inode *old_
    * silly-rename. If the silly-rename succeeds, the
    * copied dentry is hashed and becomes the new target.
    */
    - if (!new_inode)
    - goto go_ahead;
    - if (S_ISDIR(new_inode->i_mode)) {
    - error = -EISDIR;
    - if (!S_ISDIR(old_inode->i_mode))
    - goto out;
    - } else if (atomic_read(&new_dentry->d_count) > 2) {
    + if (new_inode && !S_ISDIR(new_inode->i_mode) &&
    + atomic_read(&new_dentry->d_count) > 2) {
    int err;
    /* copy the target dentry's name */
    dentry = d_alloc(new_dentry->d_parent,
    @@ -1627,7 +1622,6 @@ static int nfs_rename(struct inode *old_
    goto out;
    }

    -go_ahead:
    /*
    * ... prune child dentries and writebacks if needed.
    */
    --


    \
     
     \ /
      Last update: 2009-12-02 16:09    [W:0.019 / U:122.048 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site