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 fa6724562a4155b549acb871bfce0ad794c2c0ac..f219dccbe15a57eeca347c386ac7334a654551f1 100644 (file)
--- 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 0c8098d54d2b80e44e51aa66097475bd0d3ae584..d7eeb9d3ed6feae9a8c25f9e71d7822efba3e488 100644 (file)
--- 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;
+               }
        }
 
        /*