1 files changed, 19 insertions, 8 deletions

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index 22557716f9af..dec3c9dd04d7 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -148,6 +148,13 @@ static void fill_in_inode(struct inode *tmp_inode,
                         tmp_inode->i_mode = cifs_sb->mnt_dir_mode;
                 }
                 tmp_inode->i_mode |= S_IFDIR;
+        } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) && 
+                   (attr & ATTR_SYSTEM) && (end_of_file == 0)) {
+                *pobject_type = DT_FIFO;
+                tmp_inode->i_mode |= S_IFIFO;
+/* BB Finish for SFU style symlinks and devies */
+/*      } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) &&
+                (attr & ATTR_SYSTEM) && ) { */
 /* we no longer mark these because we could not follow them */
 /*        } else if (attr & ATTR_REPARSE) {
                 *pobject_type = DT_LNK;
@@ -190,8 +197,9 @@ static void fill_in_inode(struct inode *tmp_inode,
                 tmp_inode->i_data.a_ops = &cifs_addr_ops;
 
                 if(isNewInode)
-                        return; /* No sense invalidating pages for new inode since we
-                                           have not started caching readahead file data yet */
+                        return; /* No sense invalidating pages for new inode
+                                   since have not started caching readahead file
+                                   data yet */
 
                 if (timespec_equal(&tmp_inode->i_mtime, &local_mtime) &&
                         (local_size == tmp_inode->i_size)) {
@@ -353,7 +361,7 @@ static int initiate_cifs_search(const int xid, struct file *file)
                 return -EINVAL;
 
         down(&file->f_dentry->d_sb->s_vfs_rename_sem);
-        full_path = build_path_from_dentry(file->f_dentry);
+        full_path = build_path_from_dentry(file->f_dentry, cifs_sb);
         up(&file->f_dentry->d_sb->s_vfs_rename_sem);
 
         if(full_path == NULL) {
@@ -374,7 +382,7 @@ ffirst_retry:
 
         rc = CIFSFindFirst(xid, pTcon,full_path,cifs_sb->local_nls,
                 &cifsFile->netfid, &cifsFile->srch_inf,
-                cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
+                cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR, CIFS_DIR_SEP(cifs_sb));
         if(rc == 0)
                 cifsFile->invalidHandle = FALSE;
         if((rc == -EOPNOTSUPP) && 
@@ -536,7 +544,8 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
         while((index_to_find >= cifsFile->srch_inf.index_of_last_entry) && 
               (rc == 0) && (cifsFile->srch_inf.endOfSearch == FALSE)){
                 cFYI(1,("calling findnext2"));
-                rc = CIFSFindNext(xid,pTcon,cifsFile->netfid, &cifsFile->srch_inf);
+                rc = CIFSFindNext(xid,pTcon,cifsFile->netfid, 
+                                  &cifsFile->srch_inf);
                 if(rc)
                         return -ENOENT;
         }
@@ -555,7 +564,7 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
                 cFYI(1,("found entry - pos_in_buf %d",pos_in_buf)); 
                 current_entry = cifsFile->srch_inf.srch_entries_start;
                 for(i=0;(i<(pos_in_buf)) && (current_entry != NULL);i++) {
-                        /* go entry to next entry figuring out which we need to start with */
+                        /* go entry by entry figuring out which is first */
                         /* if( . or ..)
                                 skip */
                         rc = cifs_entry_is_dot(current_entry,cifsFile);
@@ -721,7 +730,8 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
                               (FILE_DIRECTORY_INFO *)pfindEntry,&obj_type, rc);
         }
         
-        rc = filldir(direntry,qstring.name,qstring.len,file->f_pos,tmp_inode->i_ino,obj_type);
+        rc = filldir(direntry,qstring.name,qstring.len,file->f_pos,
+                     tmp_inode->i_ino,obj_type);
         if(rc) {
                 cFYI(1,("filldir rc = %d",rc));
         }
@@ -906,7 +916,8 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                                 cifs_save_resume_key(current_entry,cifsFile);
                                 break;
                         } else 
-                                current_entry = nxt_dir_entry(current_entry,end_of_smb);
+                                current_entry = nxt_dir_entry(current_entry,
+                                                              end_of_smb);
                 }
                 kfree(tmp_buf);
                 break;