[v3,13/17] vfs: make do_unlinkat retry on ESTALE errors

Commit Message

Jeff Layton June 29, 2012, 6:57 p.m. UTC

Signed-off-by: Jeff Layton <[e-mail]>
---
 fs/namei.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

Patch

diff --git a/fs/namei.c b/fs/namei.c
index 7fccc1c..7fadc99 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2955,8 +2955,14 @@  static long do_unlinkat(int dfd, const char __user *pathname)
 	struct dentry *dentry;
 	struct nameidata nd;
 	struct inode *inode = NULL;
+	unsigned int try = 0;
+	unsigned int lookup_flags = LOOKUP_PARENT;
 
-	error = user_path_parent(dfd, pathname, &nd, &name);
+	name = getname(pathname);
+	if (IS_ERR(name))
+		return PTR_ERR(name);
+retry:
+	error = do_path_lookup(dfd, name, lookup_flags, &nd);
 	if (error)
 		return error;
 
@@ -2994,6 +3000,10 @@  exit3:
 		iput(inode);	/* truncate the inode here */
 exit1:
 	path_put(&nd.path);
+	if (retry_estale(error, try++)) {
+		lookup_flags |= LOOKUP_REVAL;
+		goto retry;
+	}
 	putname(name);
 	return error;