[CIFS] fix spelling of CONFIG_CIFS_EXPERIMENTAL ifdef in direct i/o write

Signed-off-by: Steve French (sfrench@us.ibm.com)

fs/cifs/cifsfs.c

@@ -436,7 +436,7 @@ cifs_read_wrapper(struct file * file, char __user *read_data, size_t read_size,
 
 	cFYI(1,("In read_wrapper size %zd at %lld",read_size,*poffset));
 
-#ifdef CIFS_EXPERIMENTAL    /* BB fixme - fix user char * to kernel char * mapping here BB */
+#ifdef CONFIG_CIFS_EXPERIMENTAL    /* BB fixme - fix user char * to kernel char * mapping here BB */
 	/* check whether we can cache writes locally */
 	if(file->f_dentry->d_sb) {
 		struct cifs_sb_info *cifs_sb;
@@ -481,17 +481,18 @@ cifs_write_wrapper(struct file * file, const char __user *write_data,
 
 	cFYI(1,("In write_wrapper size %zd at %lld",write_size,*poffset));
 
-#ifdef CIFS_EXPERIMENTAL    /* BB fixme - fix user char * to kernel char * mapping here BB */
+#ifdef CONFIG_CIFS_EXPERIMENTAL    /* BB fixme - fix user char * to kernel char * mapping here BB */
 	/* check whether we can cache writes locally */
 	if(file->f_dentry->d_sb) {
 		struct cifs_sb_info *cifs_sb;
 		cifs_sb = CIFS_SB(file->f_dentry->d_sb);
 		if(cifs_sb != NULL) {
-			if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO)
+			if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) {
 				return cifs_write(file,write_data,
 							write_size,poffset);
 			}
 		}
+	}
 #endif /* CIFS_EXPERIMENTAL */
 	written = generic_file_write(file,write_data,write_size,poffset);
 	if(!CIFS_I(file->f_dentry->d_inode)->clientCanCacheAll)  {

fs/cifs/connect.c

@@ -695,7 +695,12 @@ cifs_parse_mount_options(char *options, const char *devname,struct smb_vol *vol)
 				vol->file_mode =
 					simple_strtoul(value, &value, 0);
 			}
-		} else if (strnicmp(data, "dir_mode", 3) == 0) {
+		} else if (strnicmp(data, "dir_mode", 4) == 0) {
+			if (value && *value) {
+				vol->dir_mode =
+					simple_strtoul(value, &value, 0);
+			}
+		} else if (strnicmp(data, "dirmode", 4) == 0) {
 			if (value && *value) {
 				vol->dir_mode =
 					simple_strtoul(value, &value, 0);
@@ -1413,7 +1418,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 		if(volume_info.server_ino)
 			cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_SERVER_INUM;
 		if(volume_info.direct_io) {
-			cFYI(1,("mounting share using direct i/o"));
+			cERROR(1,("mounting share using direct i/o"));
 			cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO;
 		}