2 files changed, 13 insertions, 1 deletions

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index fa6724562a41..f219dccbe15a 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 0c8098d54d2b..d7eeb9d3ed6f 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;
+                }
         }
 
         /*