mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
nfs: fix comments in nfs_rename()
Comments are wrong or out of date. In particular d_drop() doesn't free the inode it just unhashes the dentry. And if target is a directory then it is not checked for being busy. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
e48de5ec25
commit
28f79a1a69
1 changed files with 5 additions and 7 deletions
12
fs/nfs/dir.c
12
fs/nfs/dir.c
|
@ -1581,7 +1581,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
|
||||
/*
|
||||
* To prevent any new references to the target during the rename,
|
||||
* we unhash the dentry and free the inode in advance.
|
||||
* we unhash the dentry in advance.
|
||||
*/
|
||||
if (!d_unhashed(new_dentry)) {
|
||||
d_drop(new_dentry);
|
||||
|
@ -1594,12 +1594,10 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
atomic_read(&new_dentry->d_count));
|
||||
|
||||
/*
|
||||
* First check whether the target is busy ... we can't
|
||||
* safely do _any_ rename if the target is in use.
|
||||
*
|
||||
* For files, make a copy of the dentry and then do a
|
||||
* silly-rename. If the silly-rename succeeds, the
|
||||
* copied dentry is hashed and becomes the new target.
|
||||
* For non-directories, check whether the target is busy and if so,
|
||||
* make a copy of the dentry and then do a silly-rename. If the
|
||||
* silly-rename succeeds, the copied dentry is hashed and becomes
|
||||
* the new target.
|
||||
*/
|
||||
if (new_inode && !S_ISDIR(new_inode->i_mode) &&
|
||||
atomic_read(&new_dentry->d_count) > 2) {
|
||||
|
|
Loading…
Reference in a new issue