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 | 24e93025ee434a58d35e5abb283c5bcc9a13e477 (patch) | |
| tree | f187100fdb63afb537e209c62e9c6bb5a95fc46b /fs | |
| parent | 27226104e60964f21717e0f452cecd45c85a64c6 (diff) | |
| download | kernel_samsung_tuna-24e93025ee434a58d35e5abb283c5bcc9a13e477.zip kernel_samsung_tuna-24e93025ee434a58d35e5abb283c5bcc9a13e477.tar.gz kernel_samsung_tuna-24e93025ee434a58d35e5abb283c5bcc9a13e477.tar.bz2 | |
nfs: clean up sillyrenaming in nfs_rename()
The d_instantiate(new_dentry, NULL) is superfluous, the dentry is
already negative. Rehashing this dummy dentry isn't needed either,
d_move() works fine on an unhashed target.
The re-checking for busy after a failed nfs_sillyrename() is bogus
too: new_dentry->d_count < 2 would be a bug here.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/dir.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 76b7f53..2c5ace4 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1611,14 +1611,11 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, /* silly-rename the existing target ... */ err = nfs_sillyrename(new_dir, new_dentry); - if (!err) { - new_dentry = rehash = dentry; - new_inode = NULL; - /* instantiate the replacement target */ - d_instantiate(new_dentry, NULL); - } else if (atomic_read(&new_dentry->d_count) > 1) - /* dentry still busy? */ + if (err) goto out; + + new_dentry = dentry; + new_inode = NULL; } } |