1 files changed, 38 insertions, 39 deletions

diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index df40cc5fd13a..770d5a9781c1 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -48,15 +48,15 @@ static void dump_cifs_file_struct(struct file *file, char *label)
         if (file) {
                 cf = file->private_data;
                 if (cf == NULL) {
-                        cFYI(1, "empty cifs private file data");
+                        cifs_dbg(FYI, "empty cifs private file data\n");
                         return;
                 }
                 if (cf->invalidHandle)
-                        cFYI(1, "invalid handle");
+                        cifs_dbg(FYI, "invalid handle\n");
                 if (cf->srch_inf.endOfSearch)
-                        cFYI(1, "end of search");
+                        cifs_dbg(FYI, "end of search\n");
                 if (cf->srch_inf.emptyDir)
-                        cFYI(1, "empty dir");
+                        cifs_dbg(FYI, "empty dir\n");
         }
 }
 #else
@@ -80,7 +80,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
         struct super_block *sb = parent->d_inode->i_sb;
         struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
 
-        cFYI(1, "%s: for %s", __func__, name->name);
+        cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
 
         dentry = d_hash_and_lookup(parent, name);
         if (unlikely(IS_ERR(dentry)))
@@ -233,7 +233,7 @@ int get_symlink_reparse_path(char *full_path, struct cifs_sb_info *cifs_sb,
                                 fid,
                                 cifs_sb->local_nls);
                 if (CIFSSMBClose(xid, ptcon, fid)) {
-                        cFYI(1, "Error closing temporary reparsepoint open");
+                        cifs_dbg(FYI, "Error closing temporary reparsepoint open\n");
                 }
         }
 }
@@ -285,7 +285,7 @@ initiate_cifs_search(const unsigned int xid, struct file *file)
                 goto error_exit;
         }
 
-        cFYI(1, "Full path: %s start at: %lld", full_path, file->f_pos);
+        cifs_dbg(FYI, "Full path: %s start at: %lld\n", full_path, file->f_pos);
 
 ffirst_retry:
         /* test for Unix extensions */
@@ -336,7 +336,7 @@ static int cifs_unicode_bytelen(const char *str)
                 if (ustr[len] == 0)
                         return len << 1;
         }
-        cFYI(1, "Unicode string longer than PATH_MAX found");
+        cifs_dbg(FYI, "Unicode string longer than PATH_MAX found\n");
         return len << 1;
 }
 
@@ -353,18 +353,18 @@ 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);
+        cifs_dbg(FYI, "new entry %p old entry %p\n", 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);
+                cifs_dbg(VFS, "search entry %p began after end of SMB %p old entry %p\n",
+                         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(FILE_DIRECTORY_INFO) > end_of_smb)))  {
-                cERROR(1, "search entry %p extends after end of SMB %p",
-                        new_entry, end_of_smb);
+                cifs_dbg(VFS, "search entry %p extends after end of SMB %p\n",
+                         new_entry, end_of_smb);
                 return NULL;
         } else
                 return new_entry;
@@ -457,7 +457,7 @@ static int cifs_fill_dirent(struct cifs_dirent *de, const void *info,
                 cifs_fill_dirent_std(de, info);
                 break;
         default:
-                cFYI(1, "Unknown findfirst level %d", level);
+                cifs_dbg(FYI, "Unknown findfirst level %d\n", level);
                 return -EINVAL;
         }
 
@@ -572,7 +572,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon,
         if (((index_to_find < cfile->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");
+                cifs_dbg(FYI, "search backing up - close and restart search\n");
                 spin_lock(&cifs_file_list_lock);
                 if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) {
                         cfile->invalidHandle = true;
@@ -582,7 +582,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon,
                 } else
                         spin_unlock(&cifs_file_list_lock);
                 if (cfile->srch_inf.ntwrk_buf_start) {
-                        cFYI(1, "freeing SMB ff cache buf on search rewind");
+                        cifs_dbg(FYI, "freeing SMB ff cache buf on search rewind\n");
                         if (cfile->srch_inf.smallBuf)
                                 cifs_small_buf_release(cfile->srch_inf.
                                                 ntwrk_buf_start);
@@ -593,7 +593,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon,
                 }
                 rc = initiate_cifs_search(xid, file);
                 if (rc) {
-                        cFYI(1, "error %d reinitiating a search on rewind",
+                        cifs_dbg(FYI, "error %d reinitiating a search on rewind\n",
                                  rc);
                         return rc;
                 }
@@ -608,7 +608,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon,
 
         while ((index_to_find >= cfile->srch_inf.index_of_last_entry) &&
                (rc == 0) && !cfile->srch_inf.endOfSearch) {
-                cFYI(1, "calling findnext2");
+                cifs_dbg(FYI, "calling findnext2\n");
                 rc = server->ops->query_dir_next(xid, tcon, &cfile->fid,
                                                  search_flags,
                                                  &cfile->srch_inf);
@@ -631,7 +631,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon,
                 first_entry_in_buffer = cfile->srch_inf.index_of_last_entry
                                         - cfile->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);
+                cifs_dbg(FYI, "found entry - pos_in_buf %d\n", pos_in_buf);
 
                 for (i = 0; (i < (pos_in_buf)) && (cur_ent != NULL); i++) {
                         /* go entry by entry figuring out which is first */
@@ -640,19 +640,18 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon,
                 }
                 if ((cur_ent == 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"
-                                  " %d index to find %lld rc %d", pos_in_buf,
-                                  index_to_find, rc);
+                        cifs_dbg(VFS, "reached end of buf searching for pos in buf %d index to find %lld rc %d\n",
+                                 pos_in_buf, index_to_find, rc);
                 }
                 rc = 0;
                 *current_entry = cur_ent;
         } else {
-                cFYI(1, "index not in buffer - could not findnext into it");
+                cifs_dbg(FYI, "index not in buffer - could not findnext into it\n");
                 return 0;
         }
 
         if (pos_in_buf >= cfile->srch_inf.entries_in_buffer) {
-                cFYI(1, "can not return entries pos_in_buf beyond last");
+                cifs_dbg(FYI, "can not return entries pos_in_buf beyond last\n");
                 *num_to_ret = 0;
         } else
                 *num_to_ret = cfile->srch_inf.entries_in_buffer - pos_in_buf;
@@ -678,8 +677,8 @@ static int cifs_filldir(char *find_entry, struct file *file, filldir_t filldir,
                 return rc;
 
         if (de.namelen > max_len) {
-                cERROR(1, "bad search response length %zd past smb end",
-                          de.namelen);
+                cifs_dbg(VFS, "bad search response length %zd past smb end\n",
+                         de.namelen);
                 return -EINVAL;
         }
 
@@ -768,7 +767,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
          */
         if (file->private_data == NULL) {
                 rc = initiate_cifs_search(xid, file);
-                cFYI(1, "initiate cifs search rc %d", rc);
+                cifs_dbg(FYI, "initiate cifs search rc %d\n", rc);
                 if (rc)
                         goto rddir2_exit;
         }
@@ -777,7 +776,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
         case 0:
                 if (filldir(direntry, ".", 1, file->f_pos,
                      file_inode(file)->i_ino, DT_DIR) < 0) {
-                        cERROR(1, "Filldir for current dir failed");
+                        cifs_dbg(VFS, "Filldir for current dir failed\n");
                         rc = -ENOMEM;
                         break;
                 }
@@ -785,7 +784,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
         case 1:
                 if (filldir(direntry, "..", 2, file->f_pos,
                      parent_ino(file->f_path.dentry), DT_DIR) < 0) {
-                        cERROR(1, "Filldir for parent dir failed");
+                        cifs_dbg(VFS, "Filldir for parent dir failed\n");
                         rc = -ENOMEM;
                         break;
                 }
@@ -804,7 +803,7 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                 cifsFile = file->private_data;
                 if (cifsFile->srch_inf.endOfSearch) {
                         if (cifsFile->srch_inf.emptyDir) {
-                                cFYI(1, "End of search, empty dir");
+                                cifs_dbg(FYI, "End of search, empty dir\n");
                                 rc = 0;
                                 break;
                         }
@@ -817,16 +816,16 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                 rc = find_cifs_entry(xid, tcon, file, &current_entry,
                                      &num_to_fill);
                 if (rc) {
-                        cFYI(1, "fce error %d", rc);
+                        cifs_dbg(FYI, "fce error %d\n", rc);
                         goto rddir2_exit;
                 } else if (current_entry != NULL) {
-                        cFYI(1, "entry %lld found", file->f_pos);
+                        cifs_dbg(FYI, "entry %lld found\n", file->f_pos);
                 } else {
-                        cFYI(1, "could not find entry");
+                        cifs_dbg(FYI, "could not find entry\n");
                         goto rddir2_exit;
                 }
-                cFYI(1, "loop through %d times filling dir for net buf %p",
-                        num_to_fill, cifsFile->srch_inf.ntwrk_buf_start);
+                cifs_dbg(FYI, "loop through %d times filling dir for net buf %p\n",
+                         num_to_fill, cifsFile->srch_inf.ntwrk_buf_start);
                 max_len = tcon->ses->server->ops->calc_smb_size(
                                 cifsFile->srch_inf.ntwrk_buf_start);
                 end_of_smb = cifsFile->srch_inf.ntwrk_buf_start + max_len;
@@ -840,8 +839,8 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                 for (i = 0; (i < num_to_fill) && (rc == 0); i++) {
                         if (current_entry == NULL) {
                                 /* evaluate whether this case is an error */
-                                cERROR(1, "past SMB end,  num to fill %d i %d",
-                                          num_to_fill, i);
+                                cifs_dbg(VFS, "past SMB end,  num to fill %d i %d\n",
+                                         num_to_fill, i);
                                 break;
                         }
                         /*
@@ -858,8 +857,8 @@ int cifs_readdir(struct file *file, void *direntry, filldir_t filldir)
                         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_dbg(FYI, "last entry in buf at pos %lld %s\n",
+                                         file->f_pos, tmp_buf);
                                 cifs_save_resume_key(current_entry, cifsFile);
                                 break;
                         } else