Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1826f2a authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

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: default avatarFabian Frederick <fabf@skynet.be>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f403d1db

fs/efs/dir.c

+3 −4
Original line number Diff line number Diff line
@@ -71,10 +71,9 @@ static int efs_readdir(struct file *file, struct dir_context *ctx) 
			inodenum = be32_to_cpu(dirslot->inode);

			namelen  = dirslot->namelen;

			nameptr  = dirslot->name;



#ifdef DEBUG

			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);

#endif

			pr_debug("%s(): block %d slot %d/%d: inode %u, name \"%s\", namelen %u\n",

				 __func__, block, slot, dirblock->slots-1,

				 inodenum, nameptr, namelen);

			if (!namelen)

				continue;

			/* found the next entry */

fs/efs/inode.c

+6 −12
Original line number Diff line number Diff line
@@ -138,12 +138,8 @@ struct inode *efs_iget(struct super_block *super, unsigned long ino) 
	}



	brelse(bh);

   

#ifdef DEBUG

	printk(KERN_DEBUG "EFS: efs_iget(): inode %lu, extents %d, mode %o\n",

	pr_debug("efs_iget(): inode %lu, extents %d, mode %o\n",

		 inode->i_ino, in->numextents, inode->i_mode);

#endif



	switch (inode->i_mode & S_IFMT) {

		case S_IFDIR: 

			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;

	}



#ifdef DEBUG

	printk(KERN_DEBUG "EFS: map_block(): indirect search for logical block %u\n", block);

#endif

	pr_debug("%s(): indirect search for logical block %u\n",

		 __func__, block);

	direxts = in->extents[0].cooked.ex_offset;

	indexts = in->numextents;
@@ -285,9 +280,8 @@ efs_block_t efs_map_block(struct inode *inode, efs_block_t block) { 
				       __func__, iblock);

				return 0;

			}

#ifdef DEBUG

			printk(KERN_DEBUG "EFS: map_block(): read indirect extent block %d\n", iblock);

#endif

			pr_debug("%s(): read indirect extent block %d\n",

				 __func__, iblock);

			first = 0;

			lastblock = iblock;

		}

fs/efs/super.c

+8 −10
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) { 
	}



#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++) {

		int	j;
@@ -196,9 +196,8 @@ static efs_block_t efs_validate_vh(struct volume_header *vh) { 
		name[j] = (char) 0;



		if (name[0]) {

			printk(KERN_DEBUG "EFS: vh: %8s block: 0x%08x size: 0x%08x\n",

				name,

				(int) be32_to_cpu(vh->vh_vd[i].vd_lbn),

			pr_debug("vh: %8s block: 0x%08x size: 0x%08x\n",

				name, (int) be32_to_cpu(vh->vh_vd[i].vd_lbn),

				(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

		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",

				i,

				(int) be32_to_cpu(vh->vh_pt[i].pt_firstlbn),

			pr_debug("pt %2d: start: %08d size: %08d type: 0x%02x (%s)\n",

				 i, (int)be32_to_cpu(vh->vh_pt[i].pt_firstlbn),

				 (int)be32_to_cpu(vh->vh_pt[i].pt_nblks),

				pt_type,

				(pt_entry->pt_name) ? pt_entry->pt_name : "unknown");

				 pt_type, (pt_entry->pt_name) ?

				 pt_entry->pt_name : "unknown");

		}

#endif

		if (IS_EFS(pt_type)) {