From 8f07e4664b320d2326fcc28cdecc27660142f381 Mon Sep 17 00:00:00 2001
From: Steve French <smfrench@gmail.com>
Date: Wed, 19 Oct 2011 21:22:41 -0500
Subject: [PATCH] --- yaml --- r: 269978 b: refs/heads/master c:
 fbcae3ea169189ee49dc6820478cb1d069b80a08 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/cifs/cifsfs.c |  4 ++++
 trunk/fs/cifs/dir.c    | 10 +++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 442be41d72f2..52e726868900 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f06ac72e929115f2772c29727152ba0832d641e4
+refs/heads/master: fbcae3ea169189ee49dc6820478cb1d069b80a08
diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c
index fa6724562a41..f219dccbe15a 100644
--- a/trunk/fs/cifs/cifsfs.c
+++ b/trunk/fs/cifs/cifsfs.c
@@ -436,6 +436,10 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
 		seq_printf(s, ",mfsymlinks");
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_FSCACHE)
 		seq_printf(s, ",fsc");
+	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)
+		seq_printf(s, ",nostrictsync");
+	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_PERM)
+		seq_printf(s, ",noperm");
 	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO)
 		seq_printf(s, ",strictcache");
 
diff --git a/trunk/fs/cifs/dir.c b/trunk/fs/cifs/dir.c
index 0c8098d54d2b..d7eeb9d3ed6f 100644
--- a/trunk/fs/cifs/dir.c
+++ b/trunk/fs/cifs/dir.c
@@ -648,8 +648,16 @@ cifs_d_revalidate(struct dentry *direntry, struct nameidata *nd)
 	if (direntry->d_inode) {
 		if (cifs_revalidate_dentry(direntry))
 			return 0;
-		else
+		else {
+			/*
+			 * Forcibly invalidate automounting directory inodes
+			 * (remote DFS directories) so to have them
+			 * instantiated again for automount
+			 */
+			if (IS_AUTOMOUNT(direntry->d_inode))
+				return 0;
 			return 1;
+		}
 	}
 
 	/*