NFS: Fix the notifications when renaming onto an existing file
Subsystems (2)
PATCH 1/1 NFS: Fix the notifications when renaming onto an existing file
NFS appears to be returning an unnecessary "delete" notification when we're doing an atomic rename. See
http://bugzilla.gnome.org/show_bug.cgi?id=575684
The fix is to get rid of the redundant call to d_delete().
---
Please apply to 2.6.27 - 2.6.29 stable series...
fs/nfs/dir.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
fs/nfs/dir.c +4 -5
@@ -1624,8 +1624,7 @@ static int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, }else if (atomic_read (&new_dentry->d_count) >1 )/* dentry still busy? */ goto out; - }else -nfs_drop_nlink (new_inode); + } go_ahead:/*
@@ -1638,10 +1637,8 @@ go_ahead: }nfs_inode_return_delegation (old_inode); -if (new_inode !=NULL ) { +if (new_inode !=NULL )nfs_inode_return_delegation (new_inode); -d_delete (new_dentry); - } error =NFS_PROTO (old_dir)->rename (old_dir, &old_dentry->d_name, new_dir, &new_dentry->d_name);
@@ -1650,6 +1647,8 @@ out:if (rehash)d_rehash (rehash);if (!error) { +if (new_inode !=NULL ) +nfs_drop_nlink (new_inode);d_move (old_dentry, new_dentry);nfs_set_verifier (new_dentry,nfs_save_change_attribute (new_dir));
Quoted 10 lines · Trond Myklebust
NFS appears to be returning an unnecessary "delete" notification when we're doing an atomic rename. See
http://bugzilla.gnome.org/show_bug.cgi?id=575684
The fix is to get rid of the redundant call to
d_delete().Signed-off-by Trond Myklebust <[email protected]>---
Please apply to 2.6.27 - 2.6.29 stable series...
Is this already in Linus's tree? If so, what is the git commit id?
thanks,
greg k-h
Quoted 6 lines · Greg KH
Quoted 5 lines · Trond Myklebust
NFS appears to be returning an unnecessary "delete" notification when we're doing an atomic rename. See
Quoted 7 lines
Quoted 5 lines
The fix is to get rid of the redundant call to
d_delete().Signed-off-by Trond Myklebust <[email protected]>---
Please apply to 2.6.27 - 2.6.29 stable series...Is this already in Linus's tree? If so, what is the git commit id?
Sorry, I forgot to include that. The commit id in mainline is b1e4adf4ea41bb8b5a7bfc1a7001f137e65495df.
Cheers
Trond
Signature · 6 lines
Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com