1 files changed, 45 insertions, 9 deletions

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 3f3538d4a1fa..c619d45060ce 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -43,7 +43,7 @@ renew_parental_timestamps(struct dentry *direntry)
 
 /* Note: caller must free return buffer */
 char *
-build_path_from_dentry(struct dentry *direntry)
+build_path_from_dentry(struct dentry *direntry, const struct cifs_sb_info *cifs_sb)
 {
         struct dentry *temp;
         int namelen = 0;
@@ -74,7 +74,7 @@ cifs_bp_rename_retry:
                 if (namelen < 0) {
                         break;
                 } else {
-                        full_path[namelen] = '\\';
+                        full_path[namelen] = CIFS_DIR_SEP(cifs_sb);
                         strncpy(full_path + namelen + 1, temp->d_name.name,
                                 temp->d_name.len);
                         cFYI(0, (" name: %s ", full_path + namelen));
@@ -138,7 +138,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
         pTcon = cifs_sb->tcon;
 
         down(&direntry->d_sb->s_vfs_rename_sem);
-        full_path = build_path_from_dentry(direntry);
+        full_path = build_path_from_dentry(direntry, cifs_sb);
         up(&direntry->d_sb->s_vfs_rename_sem);
         if(full_path == NULL) {
                 FreeXid(xid);
@@ -209,7 +209,7 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
                                                 CIFS_MOUNT_MAP_SPECIAL_CHR);
                         }
                 else {
-                        /* BB implement via Windows security descriptors */
+                        /* BB implement mode setting via Windows security descriptors */
                         /* eg CIFSSMBWinSetPerms(xid,pTcon,full_path,mode,-1,-1,local_nls);*/
                         /* could set r/o dos attribute if mode & 0222 == 0 */
                 }
@@ -226,7 +226,8 @@ cifs_create(struct inode *inode, struct dentry *direntry, int mode,
                 }
 
                 if (rc != 0) {
-                        cFYI(1,("Create worked but get_inode_info failed with rc = %d",
+                        cFYI(1,
+                             ("Create worked but get_inode_info failed rc = %d",
                               rc));
                 } else {
                         direntry->d_op = &cifs_dentry_ops;
@@ -299,12 +300,11 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, dev_t dev
         pTcon = cifs_sb->tcon;
 
         down(&direntry->d_sb->s_vfs_rename_sem);
-        full_path = build_path_from_dentry(direntry);
+        full_path = build_path_from_dentry(direntry, cifs_sb);
         up(&direntry->d_sb->s_vfs_rename_sem);
         if(full_path == NULL)
                 rc = -ENOMEM;
-        
-        if (full_path && (pTcon->ses->capabilities & CAP_UNIX)) {
+        else if (pTcon->ses->capabilities & CAP_UNIX) {
                 if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) {
                         rc = CIFSSMBUnixSetPerms(xid, pTcon, full_path,
                                 mode,(__u64)current->euid,(__u64)current->egid,
@@ -326,6 +326,42 @@ int cifs_mknod(struct inode *inode, struct dentry *direntry, int mode, dev_t dev
                         if(rc == 0)
                                 d_instantiate(direntry, newinode);
                 }
+        } else {
+                if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) {
+                        int oplock = 0;
+                        u16 fileHandle;
+                        FILE_ALL_INFO * buf;
+
+                        cFYI(1,("sfu compat create special file"));
+
+                        buf = kmalloc(sizeof(FILE_ALL_INFO),GFP_KERNEL);
+                        if(buf == NULL) {
+                                kfree(full_path);
+                                FreeXid(xid);
+                                return -ENOMEM;
+                        }
+
+                        rc = CIFSSMBOpen(xid, pTcon, full_path,
+                                         FILE_CREATE, /* fail if exists */
+                                         GENERIC_WRITE /* BB would 
+                                          WRITE_OWNER | WRITE_DAC be better? */,
+                                         /* Create a file and set the
+                                            file attribute to SYSTEM */
+                                         CREATE_NOT_DIR | CREATE_OPTION_SPECIAL,
+                                         &fileHandle, &oplock, buf,
+                                         cifs_sb->local_nls,
+                                         cifs_sb->mnt_cifs_flags & 
+                                            CIFS_MOUNT_MAP_SPECIAL_CHR);
+
+                        if(!rc) {
+                                /* BB Do not bother to decode buf since no
+                                   local inode yet to put timestamps in */
+                                CIFSSMBClose(xid, pTcon, fileHandle);
+                                d_drop(direntry);
+                        }
+                        kfree(buf);
+                        /* add code here to set EAs */
+                }
         }
 
         kfree(full_path);
@@ -360,7 +396,7 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, struct name
         /* can not grab the rename sem here since it would
         deadlock in the cases (beginning of sys_rename itself)
         in which we already have the sb rename sem */
-        full_path = build_path_from_dentry(direntry);
+        full_path = build_path_from_dentry(direntry, cifs_sb);
         if(full_path == NULL) {
                 FreeXid(xid);
                 return ERR_PTR(-ENOMEM);