diff --git a/[refs] b/[refs]
index 2431c8e4a5c2..a27ab1e8fc61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a138ebb012ac42c082ae8b40c87c1f265664391
+refs/heads/master: 25741b3e43151bc207dd2b850b0bb157c442682b
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index e8773461c7f7..411c1f7f84da 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -770,6 +770,7 @@ int cifs_mkdir(struct inode *inode, struct dentry *direntry, int mode)
 						 -1, -1, local_nls); */
 			if(direntry->d_inode) {
 				direntry->d_inode->i_mode = mode;
+				direntry->d_inode->i_mode |= S_IFDIR;
 				if(cifs_sb->mnt_cifs_flags & 
 				     CIFS_MOUNT_SET_UID) {
 					direntry->d_inode->i_uid =