diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2009-12-03 15:58:56 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-03 15:58:56 -0500 |
commit | e48de5ec25b37d42292c876c1d3337766aae89bd (patch) | |
tree | de35cc77f7d99de0c3962a213a2b4c5385065987 /fs/nfs/dir.c | |
parent | 9c4c761a629caa5572c1a29a8288416070d5d6b7 (diff) | |
download | kernel_samsung_smdk4412-e48de5ec25b37d42292c876c1d3337766aae89bd.zip kernel_samsung_smdk4412-e48de5ec25b37d42292c876c1d3337766aae89bd.tar.gz kernel_samsung_smdk4412-e48de5ec25b37d42292c876c1d3337766aae89bd.tar.bz2 |
nfs: remove unnecessary check from nfs_rename()
VFS already checks if both source and target are directories.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 7cb2985..b5fae19 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1601,13 +1601,8 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, * 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_dir, struct dentry *old_dentry, goto out; } -go_ahead: /* * ... prune child dentries and writebacks if needed. */ |