From bf4d7ade4bcdcda602ca91d1d21a2c60919f0763 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 11 Dec 2012 12:10:11 -0500
Subject: [PATCH] --- yaml --- r: 347851 b: refs/heads/master c:
 48f7530d3f722617aa7cfea62b09b0c1a8d0173e h: refs/heads/master i:   347849:
 8308d784b5716985290a3affe852c5d57fda152d   347847:
 6eba118e5ca6c514842a902a6c82e25cfabf8e6b v: v3

---
 [refs]          | 2 +-
 trunk/fs/open.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7b4aafec641c..0f95a081d7c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6a9428401c00a27d3c17264934d14e284570c97
+refs/heads/master: 48f7530d3f722617aa7cfea62b09b0c1a8d0173e
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index c819bbdab47f..07449b911a4d 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -115,17 +115,23 @@ EXPORT_SYMBOL_GPL(vfs_truncate);
 
 static long do_sys_truncate(const char __user *pathname, loff_t length)
 {
+	unsigned int lookup_flags = LOOKUP_FOLLOW;
 	struct path path;
 	int error;
 
 	if (length < 0)	/* sorry, but loff_t says... */
 		return -EINVAL;
 
-	error = user_path(pathname, &path);
+retry:
+	error = user_path_at(AT_FDCWD, pathname, lookup_flags, &path);
 	if (!error) {
 		error = vfs_truncate(&path, length);
 		path_put(&path);
 	}
+	if (retry_estale(error, lookup_flags)) {
+		lookup_flags |= LOOKUP_REVAL;
+		goto retry;
+	}
 	return error;
 }