From: Steve French <smfrench@gmail.com>
Date: Thu, 20 Oct 2011 02:22:41 +0000 (-0500)
Subject: Merge branch 'cifs-3.2' of git://git.samba.org/jlayton/linux into temp-3.2-jeff
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fbcae3ea169189ee49dc6820478cb1d069b80a08;hp=f06ac72e929115f2772c29727152ba0832d641e4;p=mv-sheeva.git

Merge branch 'cifs-3.2' of git://git.samba.org/jlayton/linux into temp-3.2-jeff
---

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index fa6724562a4..f219dccbe15 100644
--- a/fs/cifs/cifsfs.c
+++ b/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/fs/cifs/dir.c b/fs/cifs/dir.c
index 0c8098d54d2..d7eeb9d3ed6 100644
--- a/fs/cifs/dir.c
+++ b/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;
+		}
 	}
 
 	/*