diff --git a/[refs] b/[refs] index ff405df902cb..94dde3e8312d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7748dd6eab8e13f974d4664395e76afffacda04b +refs/heads/master: ad4778fb40994dd7c779069dad6ff704d75b81e6 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; + } } /*