diff --git a/[refs] b/[refs]
index 5aa8379779e9..d2064e57e0cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87fa55952b7347175c6e2f03874869ad2c055adb
+refs/heads/master: 0291c0a551d5b0856627f2cb294da05f122414a0
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index a994ccf39b40..402dfcb6720b 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -394,8 +394,9 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
 {
 	struct path path;
 	int error;
-
-	error = user_path_dir(filename, &path);
+	unsigned int lookup_flags = LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
+retry:
+	error = user_path_at(AT_FDCWD, filename, lookup_flags, &path);
 	if (error)
 		goto out;
 
@@ -407,6 +408,10 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
 
 dput_and_out:
 	path_put(&path);
+	if (retry_estale(error, lookup_flags)) {
+		lookup_flags |= LOOKUP_REVAL;
+		goto retry;
+	}
 out:
 	return error;
 }