Linux NFS development
 help / color / mirror / Atom feed
* [PATCH] NFS: nfs_rename() handle -ERESTARTSYS dentry left behind
@ 2016-12-15 14:48 Benjamin Coddington
  2016-12-15 15:02 ` Jeff Layton
  2016-12-15 22:38 ` Trond Myklebust
  0 siblings, 2 replies; 7+ messages in thread
From: Benjamin Coddington @ 2016-12-15 14:48 UTC (permalink / raw)
  To: Trond Myklebust, Anna Schumaker, Jeff Layton; +Cc: linux-nfs

An interrupted rename will leave the old dentry behind if the rename
succeeds.  Fix this by forcing a lookup the next time through
->d_revalidate.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
---
 fs/nfs/dir.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 5f1af4cd1a33..5d409616f77e 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -2100,14 +2100,24 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 		d_rehash(rehash);
 	trace_nfs_rename_exit(old_dir, old_dentry,
 			new_dir, new_dentry, error);
-	if (!error) {
+
+	switch (error) {
+	case 0:
 		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));
-	} else if (error == -ENOENT)
+		break;
+	case -ENOENT:
 		nfs_dentry_handle_enoent(old_dentry);
+		break;
+	case -ERESTARTSYS:
+		/* The result of the rename is unknown. Play it safe by
+		 * forcing a new lookup */
+		nfs_force_lookup_revalidate(old_dir);
+		nfs_force_lookup_revalidate(new_dir);
+	}
 
 	/* new dentry created? */
 	if (dentry)
-- 
2.9.3


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-12-16 14:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-15 14:48 [PATCH] NFS: nfs_rename() handle -ERESTARTSYS dentry left behind Benjamin Coddington
2016-12-15 15:02 ` Jeff Layton
2016-12-15 22:38 ` Trond Myklebust
2016-12-16 11:09   ` Benjamin Coddington
2016-12-16 14:23     ` Trond Myklebust
2016-12-16 14:35       ` Jeff Layton
2016-12-16 14:44         ` Trond Myklebust

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox