[PATCH] cifs: character mapping of special characters (part 3 of 3)

Signed-off-by: Steve French (sfrench@us.ibm.com)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 9c7755053099..1df26ddf68b1 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -254,7 +254,8 @@ int cifs_open(struct inode *inode, struct file *file)
         }
         rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, desiredAccess,
                          CREATE_NOT_DIR, &netfid, &oplock, buf,
-                         cifs_sb->local_nls);
+                         cifs_sb->local_nls, cifs_sb->mnt_cifs_flags
+                                 & CIFS_MOUNT_MAP_SPECIAL_CHR);
         if (rc) {
                 cFYI(1, ("cifs_open returned 0x%x ", rc));
                 goto out;
@@ -287,7 +288,9 @@ int cifs_open(struct inode *inode, struct file *file)
                         CIFSSMBUnixSetPerms(xid, pTcon, full_path,
                                             inode->i_mode,
                                             (__u64)-1, (__u64)-1, 0 /* dev */,
-                                            cifs_sb->local_nls);
+                                            cifs_sb->local_nls,
+                                            cifs_sb->mnt_cifs_flags & 
+                                                CIFS_MOUNT_MAP_SPECIAL_CHR);
                 } else {
                         /* BB implement via Windows security descriptors eg
                            CIFSSMBWinSetPerms(xid, pTcon, full_path, mode,
@@ -387,7 +390,8 @@ static int cifs_reopen_file(struct inode *inode, struct file *file,
         } */
         rc = CIFSSMBOpen(xid, pTcon, full_path, disposition, desiredAccess,
                          CREATE_NOT_DIR, &netfid, &oplock, NULL,
-                         cifs_sb->local_nls);
+                         cifs_sb->local_nls, cifs_sb->mnt_cifs_flags & 
+                                CIFS_MOUNT_MAP_SPECIAL_CHR);
         if (rc) {
                 up(&pCifsFile->fh_sem);
                 cFYI(1, ("cifs_open returned 0x%x ", rc));