UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs/efs: convert printk(KERN_DEBUG to pr_debug 

All KERN_DEBUG callsites being under #ifdef DEBUG we can safely convert
everything to pr_debug without changing current behaviour.

Remove #ifdef DEBUG around pr_debugs only (suggested by Joe Perches)

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Fabian Frederick 2014-06-04 16:12:13 -07:00 committed by Linus Torvalds
parent f403d1dbac
commit d1826f2a3d
3 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/efs/dir.c
View File

@ -71,10 +71,9 @@ static int efs_readdir(struct file *file, struct dir_context *ctx)
inodenum = be32_to_cpu(dirslot->inode); inodenum = be32_to_cpu(dirslot->inode);
namelen = dirslot->namelen; namelen = dirslot->namelen;
nameptr = dirslot->name; nameptr = dirslot->name;
pr_debug("%s(): block %d slot %d/%d: inode %u, name \"%s\", namelen %u\n",
#ifdef DEBUG __func__, block, slot, dirblock->slots-1,
printk(KERN_DEBUG "EFS: readdir(): block %d slot %d/%d: inode %u, name \"%s\", namelen %u\n", block, slot, dirblock->slots-1, inodenum, nameptr, namelen); inodenum, nameptr, namelen);
#endif
if (!namelen) if (!namelen)
continue; continue;
/* found the next entry */ /* found the next entry */

16
fs/efs/inode.c
View File

@ -138,12 +138,8 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino)
} }
brelse(bh); brelse(bh);
pr_debug("efs_iget(): inode %lu, extents %d, mode %o\n",
#ifdef DEBUG
printk(KERN_DEBUG "EFS: efs_iget(): inode %lu, extents %d, mode %o\n",
inode->i_ino, in->numextents, inode->i_mode); inode->i_ino, in->numextents, inode->i_mode);
#endif
switch (inode->i_mode & S_IFMT) { switch (inode->i_mode & S_IFMT) {
case S_IFDIR: case S_IFDIR:
inode->i_op = &efs_dir_inode_operations; inode->i_op = &efs_dir_inode_operations;
@ -239,9 +235,8 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {
return 0; return 0;
} }
#ifdef DEBUG pr_debug("%s(): indirect search for logical block %u\n",
printk(KERN_DEBUG "EFS: map_block(): indirect search for logical block %u\n", block); __func__, block);
#endif
direxts = in->extents[0].cooked.ex_offset; direxts = in->extents[0].cooked.ex_offset;
indexts = in->numextents; indexts = in->numextents;
@ -285,9 +280,8 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) {
__func__, iblock); __func__, iblock);
return 0; return 0;
} }
#ifdef DEBUG pr_debug("%s(): read indirect extent block %d\n",
printk(KERN_DEBUG "EFS: map_block(): read indirect extent block %d\n", iblock); __func__, iblock);
#endif
first = 0; first = 0;
lastblock = iblock; lastblock = iblock;
} }

18
fs/efs/super.c
View File

@ -184,7 +184,7 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
} }
#ifdef DEBUG #ifdef DEBUG
printk(KERN_DEBUG "EFS: bf: \"%16s\"\n", vh->vh_bootfile); pr_debug("bf: \"%16s\"\n", vh->vh_bootfile);
for(i = 0; i < NVDIR; i++) { for(i = 0; i < NVDIR; i++) {
int j; int j;
@ -196,9 +196,8 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
name[j] = (char) 0; name[j] = (char) 0;
if (name[0]) { if (name[0]) {
printk(KERN_DEBUG "EFS: vh: %8s block: 0x%08x size: 0x%08x\n", pr_debug("vh: %8s block: 0x%08x size: 0x%08x\n",
name, name, (int) be32_to_cpu(vh->vh_vd[i].vd_lbn),
(int) be32_to_cpu(vh->vh_vd[i].vd_lbn),
(int) be32_to_cpu(vh->vh_vd[i].vd_nbytes)); (int) be32_to_cpu(vh->vh_vd[i].vd_nbytes));
} }
} }
@ -211,12 +210,11 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) {
} }
#ifdef DEBUG #ifdef DEBUG
if (be32_to_cpu(vh->vh_pt[i].pt_nblks)) { if (be32_to_cpu(vh->vh_pt[i].pt_nblks)) {
printk(KERN_DEBUG "EFS: pt %2d: start: %08d size: %08d type: 0x%02x (%s)\n", pr_debug("pt %2d: start: %08d size: %08d type: 0x%02x (%s)\n",
i, i, (int)be32_to_cpu(vh->vh_pt[i].pt_firstlbn),
(int) be32_to_cpu(vh->vh_pt[i].pt_firstlbn), (int)be32_to_cpu(vh->vh_pt[i].pt_nblks),
(int) be32_to_cpu(vh->vh_pt[i].pt_nblks), pt_type, (pt_entry->pt_name) ?
pt_type, pt_entry->pt_name : "unknown");
(pt_entry->pt_name) ? pt_entry->pt_name : "unknown");
} }
#endif #endif
if (IS_EFS(pt_type)) { if (IS_EFS(pt_type)) {