Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 190 insertions, 185 deletions

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index c08bda9fcac6..916df9431336 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -2,7 +2,7 @@
  *   fs/cifs/readdir.c
  *
  *   Directory search handling
- * 
+ *
  *   Copyright (C) International Business Machines  Corp., 2004, 2007
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
@@ -34,24 +34,23 @@
 #ifdef CONFIG_CIFS_DEBUG2
 static void dump_cifs_file_struct(struct file *file, char *label)
 {
-        struct cifsFileInfo * cf;
+        struct cifsFileInfo *cf;
 
         if (file) {
                 cf = file->private_data;
                 if (cf == NULL) {
-                        cFYI(1,("empty cifs private file data"));
+                        cFYI(1, ("empty cifs private file data"));
                         return;
                 }
                 if (cf->invalidHandle) {
-                        cFYI(1,("invalid handle"));
+                        cFYI(1, ("invalid handle"));
                 }
                 if (cf->srch_inf.endOfSearch) {
-                        cFYI(1,("end of search"));
+                        cFYI(1, ("end of search"));
                 }
                 if (cf->srch_inf.emptyDir) {
-                        cFYI(1,("empty dir"));
+                        cFYI(1, ("empty dir"));
                 }
-                
         }
 }
 #endif /* DEBUG2 */
@@ -73,7 +72,8 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
         qstring->hash = full_name_hash(qstring->name, qstring->len);
         tmp_dentry = d_lookup(file->f_path.dentry, qstring);
         if (tmp_dentry) {
-                cFYI(0, ("existing dentry with inode 0x%p", tmp_dentry->d_inode));
+                cFYI(0, ("existing dentry with inode 0x%p",
+                         tmp_dentry->d_inode));
                 *ptmp_inode = tmp_dentry->d_inode;
 /* BB overwrite old name? i.e. tmp_dentry->d_name and tmp_dentry->d_name.len??*/
                 if (*ptmp_inode == NULL) {
@@ -87,7 +87,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
         } else {
                 tmp_dentry = d_alloc(file->f_path.dentry, qstring);
                 if (tmp_dentry == NULL) {
-                        cERROR(1,("Failed allocating dentry"));
+                        cERROR(1, ("Failed allocating dentry"));
                         *ptmp_inode = NULL;
                         return rc;
                 }
@@ -100,7 +100,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
                 if (*ptmp_inode == NULL)
                         return rc;
                 if (file->f_path.dentry->d_sb->s_flags & MS_NOATIME)
-                        (*ptmp_inode)->i_flags |= S_NOATIME | S_NOCMTIME;                       
+                        (*ptmp_inode)->i_flags |= S_NOATIME | S_NOCMTIME;
                 rc = 2;
         }
 
@@ -109,7 +109,7 @@ static int construct_dentry(struct qstr *qstring, struct file *file,
         return rc;
 }
 
-static void AdjustForTZ(struct cifsTconInfo * tcon, struct inode * inode)
+static void AdjustForTZ(struct cifsTconInfo *tcon, struct inode *inode)
 {
         if ((tcon) && (tcon->ses) && (tcon->ses->server)) {
                 inode->i_ctime.tv_sec += tcon->ses->server->timeAdj;
@@ -121,7 +121,7 @@ static void AdjustForTZ(struct cifsTconInfo * tcon, struct inode * inode)
 
 
 static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
-                char * buf, int *pobject_type, int isNewInode)
+                          char *buf, int *pobject_type, int isNewInode)
 {
         loff_t local_size;
         struct timespec local_mtime;
@@ -150,7 +150,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                       cifs_NTtimeToUnix(le64_to_cpu(pfindData->ChangeTime));
         } else { /* legacy, OS2 and DOS style */
 /*              struct timespec ts;*/
-                FIND_FILE_STANDARD_INFO * pfindData = 
+                FIND_FILE_STANDARD_INFO * pfindData =
                         (FIND_FILE_STANDARD_INFO *)buf;
 
                 tmp_inode->i_mtime = cnvrtDosUnixTm(
@@ -175,7 +175,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
 
         /* treat dos attribute of read-only as read-only mode bit e.g. 555? */
         /* 2767 perms - indicate mandatory locking */
-                /* BB fill in uid and gid here? with help from winbind? 
+                /* BB fill in uid and gid here? with help from winbind?
                    or retrieve from NTFS stream extended attribute */
         if (atomic_read(&cifsInfo->inUse) == 0) {
                 tmp_inode->i_uid = cifs_sb->mnt_uid;
@@ -196,7 +196,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                         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) && 
+        } else if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL) &&
                    (attr & ATTR_SYSTEM)) {
                 if (end_of_file == 0)  {
                         *pobject_type = DT_FIFO;
@@ -206,13 +206,13 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                         inode as needing revalidate and get the real type
                         (blk vs chr vs. symlink) later ie in lookup */
                         *pobject_type = DT_REG;
-                        tmp_inode->i_mode |= S_IFREG; 
-                        cifsInfo->time = 0;     
+                        tmp_inode->i_mode |= S_IFREG;
+                        cifsInfo->time = 0;
                 }
 /* we no longer mark these because we could not follow them */
 /*        } else if (attr & ATTR_REPARSE) {
-                *pobject_type = DT_LNK;
-                tmp_inode->i_mode |= S_IFLNK; */
+                *pobject_type = DT_LNK;
+                tmp_inode->i_mode |= S_IFLNK; */
         } else {
                 *pobject_type = DT_REG;
                 tmp_inode->i_mode |= S_IFREG;
@@ -220,7 +220,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                         tmp_inode->i_mode &= ~(S_IWUGO);
                 else if ((tmp_inode->i_mode & S_IWUGO) == 0)
                         /* the ATTR_READONLY flag may have been changed on   */
-                        /* server -- set any w bits allowed by mnt_file_mode */
+                        /* server -- set any w bits allowed by mnt_file_mode */
                         tmp_inode->i_mode |= (S_IWUGO & cifs_sb->mnt_file_mode);
         } /* could add code here - to validate if device or weird share type? */
 
@@ -231,7 +231,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
 
         spin_lock(&tmp_inode->i_lock);
         if (is_size_safe_to_change(cifsInfo, end_of_file)) {
-                /* can not safely change the file size here if the 
+                /* can not safely change the file size here if the
                 client is writing to it due to potential races */
                 i_size_write(tmp_inode, end_of_file);
 
@@ -254,7 +254,6 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type,
                                 tmp_inode->i_fop = &cifs_file_direct_nobrl_ops;
                         else
                                 tmp_inode->i_fop = &cifs_file_direct_ops;
-                
                 } else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)
                         tmp_inode->i_fop = &cifs_file_nobrl_ops;
                 else
@@ -322,8 +321,8 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
 
         tmp_inode->i_mode = le64_to_cpu(pfindData->Permissions);
         /* since we set the inode type below we need to mask off type
-           to avoid strange results if bits above were corrupt */
-        tmp_inode->i_mode &= ~S_IFMT;
+           to avoid strange results if bits above were corrupt */
+        tmp_inode->i_mode &= ~S_IFMT;
         if (type == UNIX_FILE) {
                 *pobject_type = DT_REG;
                 tmp_inode->i_mode |= S_IFREG;
@@ -353,7 +352,7 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
                 /* safest to just call it a file */
                 *pobject_type = DT_REG;
                 tmp_inode->i_mode |= S_IFREG;
-                cFYI(1,("unknown inode type %d",type)); 
+                cFYI(1, ("unknown inode type %d", type));
         }
 
         if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_UID)
@@ -368,7 +367,7 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
 
         spin_lock(&tmp_inode->i_lock);
         if (is_size_safe_to_change(cifsInfo, end_of_file)) {
-                /* can not safely change the file size here if the 
+                /* can not safely change the file size here if the
                 client is writing to it due to potential races */
                 i_size_write(tmp_inode, end_of_file);
 
@@ -393,15 +392,16 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
                         tmp_inode->i_fop = &cifs_file_ops;
 
                 if ((cifs_sb->tcon) && (cifs_sb->tcon->ses) &&
-                   (cifs_sb->tcon->ses->server->maxBuf < 
+                   (cifs_sb->tcon->ses->server->maxBuf <
                         PAGE_CACHE_SIZE + MAX_CIFS_HDR_SIZE))
                         tmp_inode->i_data.a_ops = &cifs_addr_ops_smallbuf;
                 else
                         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 we have not started caching readahead
+                                   file data for it yet */
 
                 if (timespec_equal(&tmp_inode->i_mtime, &local_mtime) &&
                         (local_size == tmp_inode->i_size)) {
@@ -420,7 +420,7 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
                 tmp_inode->i_op = &cifs_symlink_inode_ops;
 /* tmp_inode->i_fop = *//* do not need to set to anything */
         } else {
-                cFYI(1, ("Special inode")); 
+                cFYI(1, ("Special inode"));
                 init_special_inode(tmp_inode, tmp_inode->i_mode,
                                    tmp_inode->i_rdev);
         }
@@ -429,14 +429,14 @@ static void unix_fill_in_inode(struct inode *tmp_inode,
 static int initiate_cifs_search(const int xid, struct file *file)
 {
         int rc = 0;
-        char * full_path;
-        struct cifsFileInfo * cifsFile;
+        char *full_path;
+        struct cifsFileInfo *cifsFile;
         struct cifs_sb_info *cifs_sb;
         struct cifsTconInfo *pTcon;
 
         if (file->private_data == NULL) {
-                file->private_data = 
-                        kzalloc(sizeof(struct cifsFileInfo),GFP_KERNEL);
+                file->private_data =
+                        kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
         }
 
         if (file->private_data == NULL)
@@ -463,9 +463,11 @@ static int initiate_cifs_search(const int xid, struct file *file)
 
 ffirst_retry:
         /* test for Unix extensions */
-        if (pTcon->ses->capabilities & CAP_UNIX) {
+        /* but now check for them on the share/mount not on the SMB session */
+/*      if (pTcon->ses->capabilities & CAP_UNIX) { */
+        if (pTcon->unix_ext) {
                 cifsFile->srch_inf.info_level = SMB_FIND_FILE_UNIX;
-        } else if ((pTcon->ses->capabilities & 
+        } else if ((pTcon->ses->capabilities &
                         (CAP_NT_SMBS | CAP_NT_FIND)) == 0) {
                 cifsFile->srch_inf.info_level = SMB_FIND_FILE_INFO_STANDARD;
         } else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
@@ -474,13 +476,13 @@ ffirst_retry:
                 cifsFile->srch_inf.info_level = SMB_FIND_FILE_DIRECTORY_INFO;
         }
 
-        rc = CIFSFindFirst(xid, pTcon,full_path,cifs_sb->local_nls,
+        rc = CIFSFindFirst(xid, pTcon, full_path, cifs_sb->local_nls,
                 &cifsFile->netfid, &cifsFile->srch_inf,
-                cifs_sb->mnt_cifs_flags & 
+                cifs_sb->mnt_cifs_flags &
                         CIFS_MOUNT_MAP_SPECIAL_CHR, CIFS_DIR_SEP(cifs_sb));
         if (rc == 0)
                 cifsFile->invalidHandle = FALSE;
-        if ((rc == -EOPNOTSUPP) && 
+        if ((rc == -EOPNOTSUPP) &&
                 (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)) {
                 cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_SERVER_INUM;
                 goto ffirst_retry;
@@ -495,17 +497,17 @@ static int cifs_unicode_bytelen(char *str)
         int len;
         __le16 * ustr = (__le16 *)str;
 
-        for(len=0;len <= PATH_MAX;len++) {
+        for (len = 0; len <= PATH_MAX; len++) {
                 if (ustr[len] == 0)
                         return len << 1;
         }
-        cFYI(1,("Unicode string longer than PATH_MAX found"));
+        cFYI(1, ("Unicode string longer than PATH_MAX found"));
         return len << 1;
 }
 
 static char *nxt_dir_entry(char *old_entry, char *end_of_smb, int level)
 {
-        char * new_entry;
+        char *new_entry;
         FILE_DIRECTORY_INFO * pDirInfo = (FILE_DIRECTORY_INFO *)old_entry;
 
         if (level == SMB_FIND_FILE_INFO_STANDARD) {
@@ -516,21 +518,21 @@ static char *nxt_dir_entry(char *old_entry, char *end_of_smb, int level)
                                 pfData->FileNameLength;
         } else
                 new_entry = old_entry + le32_to_cpu(pDirInfo->NextEntryOffset);
-        cFYI(1,("new entry %p old entry %p",new_entry,old_entry));
+        cFYI(1, ("new entry %p old entry %p", new_entry, old_entry));
         /* validate that new_entry is not past end of SMB */
         if (new_entry >= end_of_smb) {
                 cERROR(1,
                       ("search entry %p began after end of SMB %p old entry %p",
-                        new_entry, end_of_smb, old_entry)); 
+                        new_entry, end_of_smb, old_entry));
                 return NULL;
         } else if (((level == SMB_FIND_FILE_INFO_STANDARD) &&
-                   (new_entry + sizeof(FIND_FILE_STANDARD_INFO) > end_of_smb)) ||
-                  ((level != SMB_FIND_FILE_INFO_STANDARD) &&
+                    (new_entry + sizeof(FIND_FILE_STANDARD_INFO) > end_of_smb))
+                  || ((level != SMB_FIND_FILE_INFO_STANDARD) &&
                    (new_entry + sizeof(FILE_DIRECTORY_INFO) > end_of_smb)))  {
-                cERROR(1,("search entry %p extends after end of SMB %p",
+                cERROR(1, ("search entry %p extends after end of SMB %p",
                         new_entry, end_of_smb));
                 return NULL;
-        } else 
+        } else
                 return new_entry;
 
 }
@@ -541,8 +543,8 @@ static char *nxt_dir_entry(char *old_entry, char *end_of_smb, int level)
 static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)
 {
         int rc = 0;
-        char * filename = NULL;
-        int len = 0; 
+        char *filename = NULL;
+        int len = 0;
 
         if (cfile->srch_inf.info_level == SMB_FIND_FILE_UNIX) {
                 FILE_UNIX_INFO * pFindData = (FILE_UNIX_INFO *)current_entry;
@@ -554,25 +556,25 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)
                         len = strnlen(filename, 5);
                 }
         } else if (cfile->srch_inf.info_level == SMB_FIND_FILE_DIRECTORY_INFO) {
-                FILE_DIRECTORY_INFO * pFindData = 
+                FILE_DIRECTORY_INFO * pFindData =
                         (FILE_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
-        } else if (cfile->srch_inf.info_level == 
+        } else if (cfile->srch_inf.info_level ==
                         SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
-                FILE_FULL_DIRECTORY_INFO * pFindData = 
+                FILE_FULL_DIRECTORY_INFO * pFindData =
                         (FILE_FULL_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
         } else if (cfile->srch_inf.info_level ==
                         SMB_FIND_FILE_ID_FULL_DIR_INFO) {
-                SEARCH_ID_FULL_DIR_INFO * pFindData = 
+                SEARCH_ID_FULL_DIR_INFO * pFindData =
                         (SEARCH_ID_FULL_DIR_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
-        } else if (cfile->srch_inf.info_level == 
+        } else if (cfile->srch_inf.info_level ==
                         SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
-                FILE_BOTH_DIRECTORY_INFO * pFindData = 
+                FILE_BOTH_DIRECTORY_INFO * pFindData =
                         (FILE_BOTH_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
@@ -582,7 +584,8 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)
                 filename = &pFindData->FileName[0];
                 len = pFindData->FileNameLength;
         } else {
-                cFYI(1,("Unknown findfirst level %d",cfile->srch_inf.info_level));
+                cFYI(1, ("Unknown findfirst level %d",
+                         cfile->srch_inf.info_level));
         }
 
         if (filename) {
@@ -595,15 +598,15 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)
                         } else if (len == 4) {
                                 /* check for .. */
                                 if ((ufilename[0] == UNICODE_DOT)
-                                   &&(ufilename[1] == UNICODE_DOT))
+                                   && (ufilename[1] == UNICODE_DOT))
                                         rc = 2;
                         }
                 } else /* ASCII */ {
                         if (len == 1) {
-                                if (filename[0] == '.') 
+                                if (filename[0] == '.')
                                         rc = 1;
                         } else if (len == 2) {
-                                if((filename[0] == '.') && (filename[1] == '.'))
+                                if ((filename[0] == '.') && (filename[1] == '.'))
                                         rc = 2;
                         }
                 }
@@ -614,7 +617,7 @@ static int cifs_entry_is_dot(char *current_entry, struct cifsFileInfo *cfile)
 
 /* Check if directory that we are searching has changed so we can decide
    whether we can use the cached search results from the previous search */
-static int is_dir_changed(struct file * file)
+static int is_dir_changed(struct file *file)
 {
         struct inode *inode = file->f_path.dentry->d_inode;
         struct cifsInodeInfo *cifsInfo = CIFS_I(inode);
@@ -633,22 +636,22 @@ static int is_dir_changed(struct file * file)
 /* We start counting in the buffer with entry 2 and increment for every
    entry (do not increment for . or .. entry) */
 static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
-        struct file *file, char **ppCurrentEntry, int *num_to_ret) 
+        struct file *file, char **ppCurrentEntry, int *num_to_ret)
 {
         int rc = 0;
         int pos_in_buf = 0;
         loff_t first_entry_in_buffer;
         loff_t index_to_find = file->f_pos;
-        struct cifsFileInfo * cifsFile = file->private_data;
+        struct cifsFileInfo *cifsFile = file->private_data;
         /* check if index in the buffer */
-        
-        if ((cifsFile == NULL) || (ppCurrentEntry == NULL) || 
+
+        if ((cifsFile == NULL) || (ppCurrentEntry == NULL) ||
            (num_to_ret == NULL))
                 return -ENOENT;
-        
+
         *ppCurrentEntry = NULL;
-        first_entry_in_buffer = 
-                cifsFile->srch_inf.index_of_last_entry - 
+        first_entry_in_buffer =
+                cifsFile->srch_inf.index_of_last_entry -
                         cifsFile->srch_inf.entries_in_buffer;
 
         /* if first entry in buf is zero then is first buffer
@@ -660,17 +663,17 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
 #ifdef CONFIG_CIFS_DEBUG2
         dump_cifs_file_struct(file, "In fce ");
 #endif
-        if (((index_to_find < cifsFile->srch_inf.index_of_last_entry) && 
-             is_dir_changed(file)) || 
+        if (((index_to_find < cifsFile->srch_inf.index_of_last_entry) &&
+             is_dir_changed(file)) ||
            (index_to_find < first_entry_in_buffer)) {
                 /* close and restart search */
-                cFYI(1,("search backing up - close and restart search"));
+                cFYI(1, ("search backing up - close and restart search"));
                 cifsFile->invalidHandle = TRUE;
                 CIFSFindClose(xid, pTcon, cifsFile->netfid);
                 kfree(cifsFile->search_resume_name);
                 cifsFile->search_resume_name = NULL;
                 if (cifsFile->srch_inf.ntwrk_buf_start) {
-                        cFYI(1,("freeing SMB ff cache buf on search rewind"));
+                        cFYI(1, ("freeing SMB ff cache buf on search rewind"));
                         if (cifsFile->srch_inf.smallBuf)
                                 cifs_small_buf_release(cifsFile->srch_inf.
                                                 ntwrk_buf_start);
@@ -678,17 +681,18 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
                                 cifs_buf_release(cifsFile->srch_inf.
                                                 ntwrk_buf_start);
                 }
-                rc = initiate_cifs_search(xid,file);
+                rc = initiate_cifs_search(xid, file);
                 if (rc) {
-                        cFYI(1,("error %d reinitiating a search on rewind",rc));
+                        cFYI(1, ("error %d reinitiating a search on rewind",
+                                 rc));
                         return rc;
                 }
         }
 
-        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, 
+        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);
                 if (rc)
                         return -ENOENT;
@@ -697,8 +701,8 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
                 /* we found the buffer that contains the entry */
                 /* scan and find it */
                 int i;
-                char * current_entry;
-                char * end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + 
+                char *current_entry;
+                char *end_of_smb = cifsFile->srch_inf.ntwrk_buf_start +
                         smbCalcSize((struct smb_hdr *)
                                 cifsFile->srch_inf.ntwrk_buf_start);
 
@@ -706,28 +710,28 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
                 first_entry_in_buffer = cifsFile->srch_inf.index_of_last_entry
                                         - cifsFile->srch_inf.entries_in_buffer;
                 pos_in_buf = index_to_find - first_entry_in_buffer;
-                cFYI(1,("found entry - pos_in_buf %d",pos_in_buf));
+                cFYI(1, ("found entry - pos_in_buf %d", pos_in_buf));
 
-                for(i=0;(i<(pos_in_buf)) && (current_entry != NULL);i++) {
+                for (i=0; (i < (pos_in_buf)) && (current_entry != NULL); i++) {
                         /* go entry by entry figuring out which is first */
-                        current_entry = nxt_dir_entry(current_entry,end_of_smb,
+                        current_entry = nxt_dir_entry(current_entry, end_of_smb,
                                                 cifsFile->srch_inf.info_level);
                 }
-                if((current_entry == NULL) && (i < pos_in_buf)) {
+                if ((current_entry == NULL) && (i < pos_in_buf)) {
                         /* BB fixme - check if we should flag this error */
-                        cERROR(1,("reached end of buf searching for pos in buf"
+                        cERROR(1, ("reached end of buf searching for pos in buf"
                           " %d index to find %lld rc %d",
-                          pos_in_buf,index_to_find,rc));
+                          pos_in_buf, index_to_find, rc));
                 }
                 rc = 0;
                 *ppCurrentEntry = current_entry;
         } else {
-                cFYI(1,("index not in buffer - could not findnext into it"));
+                cFYI(1, ("index not in buffer - could not findnext into it"));
                 return 0;
         }
 
-        if(pos_in_buf >= cifsFile->srch_inf.entries_in_buffer) {
-                cFYI(1,("can not return entries pos_in_buf beyond last entry"));
+        if (pos_in_buf >= cifsFile->srch_inf.entries_in_buffer) {
+                cFYI(1, ("can not return entries pos_in_buf beyond last"));
                 *num_to_ret = 0;
         } else
                 *num_to_ret = cifsFile->srch_inf.entries_in_buffer - pos_in_buf;
@@ -738,81 +742,81 @@ static int find_cifs_entry(const int xid, struct cifsTconInfo *pTcon,
 /* inode num, inode type and filename returned */
 static int cifs_get_name_from_search_buf(struct qstr *pqst,
         char *current_entry, __u16 level, unsigned int unicode,
-        struct cifs_sb_info * cifs_sb, int max_len, ino_t *pinum)
+        struct cifs_sb_info *cifs_sb, int max_len, ino_t *pinum)
 {
         int rc = 0;
         unsigned int len = 0;
-        char * filename;
-        struct nls_table * nlt = cifs_sb->local_nls;
+        char *filename;
+        struct nls_table *nlt = cifs_sb->local_nls;
 
         *pinum = 0;
 
-        if(level == SMB_FIND_FILE_UNIX) {
-                FILE_UNIX_INFO * pFindData = (FILE_UNIX_INFO *)current_entry;
+        if (level == SMB_FIND_FILE_UNIX) {
+                FILE_UNIX_INFO *pFindData = (FILE_UNIX_INFO *)current_entry;
 
                 filename = &pFindData->FileName[0];
-                if(unicode) {
+                if (unicode) {
                         len = cifs_unicode_bytelen(filename);
                 } else {
                         /* BB should we make this strnlen of PATH_MAX? */
                         len = strnlen(filename, PATH_MAX);
                 }
 
-                /* BB fixme - hash low and high 32 bits if not 64 bit arch BB fixme */
-                if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)
+                /* BB fixme - hash low and high 32 bits if not 64 bit arch BB */
+                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)
                         *pinum = pFindData->UniqueId;
-        } else if(level == SMB_FIND_FILE_DIRECTORY_INFO) {
-                FILE_DIRECTORY_INFO * pFindData = 
+        } else if (level == SMB_FIND_FILE_DIRECTORY_INFO) {
+                FILE_DIRECTORY_INFO *pFindData =
                         (FILE_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
-        } else if(level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
-                FILE_FULL_DIRECTORY_INFO * pFindData = 
+        } else if (level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
+                FILE_FULL_DIRECTORY_INFO *pFindData =
                         (FILE_FULL_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
-        } else if(level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {
-                SEARCH_ID_FULL_DIR_INFO * pFindData = 
+        } else if (level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {
+                SEARCH_ID_FULL_DIR_INFO *pFindData =
                         (SEARCH_ID_FULL_DIR_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
                 *pinum = pFindData->UniqueId;
-        } else if(level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
-                FILE_BOTH_DIRECTORY_INFO * pFindData = 
+        } else if (level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
+                FILE_BOTH_DIRECTORY_INFO *pFindData =
                         (FILE_BOTH_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
-        } else if(level == SMB_FIND_FILE_INFO_STANDARD) {
+        } else if (level == SMB_FIND_FILE_INFO_STANDARD) {
                 FIND_FILE_STANDARD_INFO * pFindData =
                         (FIND_FILE_STANDARD_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 /* one byte length, no name conversion */
                 len = (unsigned int)pFindData->FileNameLength;
         } else {
-                cFYI(1,("Unknown findfirst level %d",level));
+                cFYI(1, ("Unknown findfirst level %d", level));
                 return -EINVAL;
         }
 
-        if(len > max_len) {
-                cERROR(1,("bad search response length %d past smb end", len));
+        if (len > max_len) {
+                cERROR(1, ("bad search response length %d past smb end", len));
                 return -EINVAL;
         }
 
-        if(unicode) {
+        if (unicode) {
                 /* BB fixme - test with long names */
                 /* Note converted filename can be longer than in unicode */
-                if(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR)
+                if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR)
                         pqst->len = cifs_convertUCSpath((char *)pqst->name,
                                         (__le16 *)filename, len/2, nlt);
                 else
                         pqst->len = cifs_strfromUCS_le((char *)pqst->name,
-                                        (__le16 *)filename,len/2,nlt);
+                                        (__le16 *)filename, len/2, nlt);
         } else {
                 pqst->name = filename;
                 pqst->len = len;
         }
-        pqst->hash = full_name_hash(pqst->name,pqst->len);
-/*      cFYI(1,("filldir on %s",pqst->name));  */
+        pqst->hash = full_name_hash(pqst->name, pqst->len);
+/*      cFYI(1, ("filldir on %s",pqst->name));  */
         return rc;
 }
 
@@ -821,49 +825,50 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
 {
         int rc = 0;
         struct qstr qstring;
-        struct cifsFileInfo * pCifsF;
+        struct cifsFileInfo *pCifsF;
         unsigned obj_type;
         ino_t  inum;
-        struct cifs_sb_info * cifs_sb;
+        struct cifs_sb_info *cifs_sb;
         struct inode *tmp_inode;
         struct dentry *tmp_dentry;
 
         /* get filename and len into qstring */
         /* get dentry */
         /* decide whether to create and populate ionde */
-        if((direntry == NULL) || (file == NULL))
+        if ((direntry == NULL) || (file == NULL))
                 return -EINVAL;
 
         pCifsF = file->private_data;
-        
-        if((scratch_buf == NULL) || (pfindEntry == NULL) || (pCifsF == NULL))
+
+        if ((scratch_buf == NULL) || (pfindEntry == NULL) || (pCifsF == NULL))
                 return -ENOENT;
 
-        rc = cifs_entry_is_dot(pfindEntry,pCifsF);
+        rc = cifs_entry_is_dot(pfindEntry, pCifsF);
         /* skip . and .. since we added them first */
-        if(rc != 0) 
+        if (rc != 0)
                 return 0;
 
         cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
 
         qstring.name = scratch_buf;
-        rc = cifs_get_name_from_search_buf(&qstring,pfindEntry,
+        rc = cifs_get_name_from_search_buf(&qstring, pfindEntry,
                         pCifsF->srch_inf.info_level,
-                        pCifsF->srch_inf.unicode,cifs_sb,
+                        pCifsF->srch_inf.unicode, cifs_sb,
                         max_len,
                         &inum /* returned */);
 
-        if(rc)
+        if (rc)
                 return rc;
 
-        rc = construct_dentry(&qstring,file,&tmp_inode, &tmp_dentry);
-        if((tmp_inode == NULL) || (tmp_dentry == NULL))
+        rc = construct_dentry(&qstring, file, &tmp_inode, &tmp_dentry);
+        if ((tmp_inode == NULL) || (tmp_dentry == NULL))
                 return -ENOMEM;
 
-        if(rc) {
+        if (rc) {
                 /* inode created, we need to hash it with right inode number */
-                if(inum != 0) {
-                        /* BB fixme - hash the 2 32 quantities bits together if necessary BB */
+                if (inum != 0) {
+                        /* BB fixme - hash the 2 32 quantities bits together if
+                         *  necessary BB */
                         tmp_inode->i_ino = inum;
                 }
                 insert_inode_hash(tmp_inode);
@@ -872,27 +877,27 @@ static int cifs_filldir(char *pfindEntry, struct file *file,
         /* we pass in rc below, indicating whether it is a new inode,
            so we can figure out whether to invalidate the inode cached
            data if the file has changed */
-        if(pCifsF->srch_inf.info_level == SMB_FIND_FILE_UNIX)
+        if (pCifsF->srch_inf.info_level == SMB_FIND_FILE_UNIX)
                 unix_fill_in_inode(tmp_inode,
                                    (FILE_UNIX_INFO *)pfindEntry,
                                    &obj_type, rc);
-        else if(pCifsF->srch_inf.info_level == SMB_FIND_FILE_INFO_STANDARD)
+        else if (pCifsF->srch_inf.info_level == SMB_FIND_FILE_INFO_STANDARD)
                 fill_in_inode(tmp_inode, 0 /* old level 1 buffer type */,
                                 pfindEntry, &obj_type, rc);
         else
                 fill_in_inode(tmp_inode, 1 /* NT */, pfindEntry, &obj_type, rc);
 
-        if(rc) /* new inode - needs to be tied to dentry */ {
+        if (rc) /* new inode - needs to be tied to dentry */ {
                 d_instantiate(tmp_dentry, tmp_inode);
-                if(rc == 2)
+                if (rc == 2)
                         d_rehash(tmp_dentry);
         }
-        
-        
-        rc = filldir(direntry,qstring.name,qstring.len,file->f_pos,
-                     tmp_inode->i_ino,obj_type);
-        if(rc) {
-                cFYI(1,("filldir rc = %d",rc));
+
+
+        rc = filldir(direntry, qstring.name, qstring.len, file->f_pos,
+                     tmp_inode->i_ino, obj_type);
+        if (rc) {
+                cFYI(1, ("filldir rc = %d", rc));
                 /* we can not return filldir errors to the caller
                 since they are "normal" when the stat blocksize
                 is too small - we return remapped error instead */
@@ -909,57 +914,57 @@ static int cifs_save_resume_key(const char *current_entry,
         int rc = 0;
         unsigned int len = 0;
         __u16 level;
-        char * filename;
+        char *filename;
 
-        if((cifsFile == NULL) || (current_entry == NULL))
+        if ((cifsFile == NULL) || (current_entry == NULL))
                 return -EINVAL;
 
         level = cifsFile->srch_inf.info_level;
 
-        if(level == SMB_FIND_FILE_UNIX) {
+        if (level == SMB_FIND_FILE_UNIX) {
                 FILE_UNIX_INFO * pFindData = (FILE_UNIX_INFO *)current_entry;
 
                 filename = &pFindData->FileName[0];
-                if(cifsFile->srch_inf.unicode) {
+                if (cifsFile->srch_inf.unicode) {
                         len = cifs_unicode_bytelen(filename);
                 } else {
                         /* BB should we make this strnlen of PATH_MAX? */
                         len = strnlen(filename, PATH_MAX);
                 }
                 cifsFile->srch_inf.resume_key = pFindData->ResumeKey;
-        } else if(level == SMB_FIND_FILE_DIRECTORY_INFO) {
-                FILE_DIRECTORY_INFO * pFindData = 
+        } else if (level == SMB_FIND_FILE_DIRECTORY_INFO) {
+                FILE_DIRECTORY_INFO *pFindData =
                         (FILE_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
                 cifsFile->srch_inf.resume_key = pFindData->FileIndex;
-        } else if(level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
-                FILE_FULL_DIRECTORY_INFO * pFindData = 
+        } else if (level == SMB_FIND_FILE_FULL_DIRECTORY_INFO) {
+                FILE_FULL_DIRECTORY_INFO *pFindData =
                         (FILE_FULL_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
                 cifsFile->srch_inf.resume_key = pFindData->FileIndex;
-        } else if(level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {
-                SEARCH_ID_FULL_DIR_INFO * pFindData = 
+        } else if (level == SMB_FIND_FILE_ID_FULL_DIR_INFO) {
+                SEARCH_ID_FULL_DIR_INFO *pFindData =
                         (SEARCH_ID_FULL_DIR_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
                 cifsFile->srch_inf.resume_key = pFindData->FileIndex;
-        } else if(level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
-                FILE_BOTH_DIRECTORY_INFO * pFindData = 
+        } else if (level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) {
+                FILE_BOTH_DIRECTORY_INFO *pFindData =
                         (FILE_BOTH_DIRECTORY_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 len = le32_to_cpu(pFindData->FileNameLength);
                 cifsFile->srch_inf.resume_key = pFindData->FileIndex;
-        } else if(level == SMB_FIND_FILE_INFO_STANDARD) {
-                FIND_FILE_STANDARD_INFO * pFindData =
+        } else if (level == SMB_FIND_FILE_INFO_STANDARD) {
+                FIND_FILE_STANDARD_INFO *pFindData =
                         (FIND_FILE_STANDARD_INFO *)current_entry;
                 filename = &pFindData->FileName[0];
                 /* one byte length, no name conversion */
                 len = (unsigned int)pFindData->FileNameLength;
                 cifsFile->srch_inf.resume_key = pFindData->ResumeKey;
         } else {
-                cFYI(1,("Unknown findfirst level %d",level));
+                cFYI(1, ("Unknown findfirst level %d", level));
                 return -EINVAL;
         }
         cifsFile->srch_inf.resume_name_len = len;
@@ -970,21 +975,21 @@ static int cifs_save_resume_key(const char *current_entry,
 int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
 {
         int rc = 0;
-        int xid,i;
+        int xid, i;
         struct cifs_sb_info *cifs_sb;
         struct cifsTconInfo *pTcon;
         struct cifsFileInfo *cifsFile = NULL;
-        char * current_entry;
+        char *current_entry;
         int num_to_fill = 0;
-        char * tmp_buf = NULL;
-        char * end_of_smb;
+        char *tmp_buf = NULL;
+        char *end_of_smb;
         int max_len;
 
         xid = GetXid();
 
         cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
         pTcon = cifs_sb->tcon;
-        if(pTcon == NULL)
+        if (pTcon == NULL)
                 return -EINVAL;
 
         switch ((int) file->f_pos) {
@@ -1005,27 +1010,27 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                 }
                 file->f_pos++;
         default:
-                /* 1) If search is active, 
-                        is in current search buffer? 
+                /* 1) If search is active,
+                        is in current search buffer?
                         if it before then restart search
                         if after then keep searching till find it */
 
-                if(file->private_data == NULL) {
-                        rc = initiate_cifs_search(xid,file);
-                        cFYI(1,("initiate cifs search rc %d",rc));
-                        if(rc) {
+                if (file->private_data == NULL) {
+                        rc = initiate_cifs_search(xid, file);
+                        cFYI(1, ("initiate cifs search rc %d", rc));
+                        if (rc) {
                                 FreeXid(xid);
                                 return rc;
                         }
                 }
-                if(file->private_data == NULL) {
+                if (file->private_data == NULL) {
                         rc = -EINVAL;
                         FreeXid(xid);
                         return rc;
                 }
                 cifsFile = file->private_data;
                 if (cifsFile->srch_inf.endOfSearch) {
-                        if(cifsFile->srch_inf.emptyDir) {
+                        if (cifsFile->srch_inf.emptyDir) {
                                 cFYI(1, ("End of search, empty dir"));
                                 rc = 0;
                                 break;
@@ -1033,23 +1038,23 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                 } /* else {
                         cifsFile->invalidHandle = TRUE;
                         CIFSFindClose(xid, pTcon, cifsFile->netfid);
-                } 
+                }
                 kfree(cifsFile->search_resume_name);
                 cifsFile->search_resume_name = NULL; */
 
-                rc = find_cifs_entry(xid,pTcon, file,
-                                &current_entry,&num_to_fill);
-                if(rc) {
-                        cFYI(1,("fce error %d",rc)); 
+                rc = find_cifs_entry(xid, pTcon, file,
+                                &current_entry, &num_to_fill);
+                if (rc) {
+                        cFYI(1, ("fce error %d", rc));
                         goto rddir2_exit;
                 } else if (current_entry != NULL) {
-                        cFYI(1,("entry %lld found",file->f_pos));
+                        cFYI(1, ("entry %lld found", file->f_pos));
                 } else {
-                        cFYI(1,("could not find entry"));
+                        cFYI(1, ("could not find entry"));
                         goto rddir2_exit;
                 }
-                cFYI(1,("loop through %d times filling dir for net buf %p",
-                        num_to_fill,cifsFile->srch_inf.ntwrk_buf_start));
+                cFYI(1, ("loop through %d times filling dir for net buf %p",
+                        num_to_fill, cifsFile->srch_inf.ntwrk_buf_start));
                 max_len = smbCalcSize((struct smb_hdr *)
                                 cifsFile->srch_inf.ntwrk_buf_start);
                 end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + max_len;
@@ -1059,8 +1064,8 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                 such multibyte target UTF-8 characters. cifs_unicode.c,
                 which actually does the conversion, has the same limit */
                 tmp_buf = kmalloc((2 * NAME_MAX) + 4, GFP_KERNEL);
-                for(i=0;(i<num_to_fill) && (rc == 0);i++) {
-                        if(current_entry == NULL) {
+                for (i = 0; (i < num_to_fill) && (rc == 0); i++) {
+                        if (current_entry == NULL) {
                                 /* evaluate whether this case is an error */
                                 cERROR(1,("past end of SMB num to fill %d i %d",
                                           num_to_fill, i));
@@ -1070,20 +1075,20 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                         we want to check for that here? */
                         rc = cifs_filldir(current_entry, file,
                                         filldir, direntry, tmp_buf, max_len);
-                        if(rc == -EOVERFLOW) {
+                        if (rc == -EOVERFLOW) {
                                 rc = 0;
                                 break;
                         }
 
                         file->f_pos++;
-                        if(file->f_pos == 
+                        if (file->f_pos ==
                                 cifsFile->srch_inf.index_of_last_entry) {
-                                cFYI(1,("last entry in buf at pos %lld %s",
-                                        file->f_pos,tmp_buf));
-                                cifs_save_resume_key(current_entry,cifsFile);
+                                cFYI(1, ("last entry in buf at pos %lld %s",
+                                        file->f_pos, tmp_buf));
+                                cifs_save_resume_key(current_entry, cifsFile);
                                 break;
-                        } else 
-                                current_entry = 
+                        } else
+                                current_entry =
                                         nxt_dir_entry(current_entry, end_of_smb,
                                                 cifsFile->srch_inf.info_level);
                 }