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

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

fs/hpfs: convert printk to pr_foo() 



No level printk in hptfs_error converted to pr_err (others to pr_warn or
pr_info)

This patch also fixes if/then/else checkpatch warnings

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 45641c82

fs/hpfs/alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ void hpfs_free_sectors(struct super_block *s, secno sec, unsigned n) 
	struct quad_buffer_head qbh;

	__le32 *bmp;

	struct hpfs_sb_info *sbi = hpfs_sb(s);

	/*printk("2 - ");*/

	/*pr_info("2 - ");*/

	if (!n) return;

	if (sec < 0x12) {

		hpfs_error(s, "Trying to free reserved sector %08x", sec);

fs/hpfs/buffer.c

+6 −6
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void *hpfs_map_sector(struct super_block *s, unsigned secno, struct buffer_head 
	if (bh != NULL)

		return bh->b_data;

	else {

		printk("HPFS: hpfs_map_sector: read error\n");

		pr_warn("HPFS: hpfs_map_sector: read error\n");

		return NULL;

	}

}
@@ -76,7 +76,7 @@ void *hpfs_get_sector(struct super_block *s, unsigned secno, struct buffer_head 
		set_buffer_uptodate(bh);

		return bh->b_data;

	} else {

		printk("HPFS: hpfs_get_sector: getblk failed\n");

		pr_warn("HPFS: hpfs_get_sector: getblk failed\n");

		return NULL;

	}

}
@@ -93,7 +93,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe 
	cond_resched();



	if (secno & 3) {

		printk("HPFS: hpfs_map_4sectors: unaligned read\n");

		pr_warn("HPFS: hpfs_map_4sectors: unaligned read\n");

		return NULL;

	}
@@ -112,7 +112,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe 


	qbh->data = data = kmalloc(2048, GFP_NOFS);

	if (!data) {

		printk("HPFS: hpfs_map_4sectors: out of memory\n");

		pr_warn("HPFS: hpfs_map_4sectors: out of memory\n");

		goto bail4;

	}
@@ -145,7 +145,7 @@ void *hpfs_get_4sectors(struct super_block *s, unsigned secno, 
	hpfs_lock_assert(s);



	if (secno & 3) {

		printk("HPFS: hpfs_get_4sectors: unaligned read\n");

		pr_warn("HPFS: hpfs_get_4sectors: unaligned read\n");

		return NULL;

	}
@@ -161,7 +161,7 @@ void *hpfs_get_4sectors(struct super_block *s, unsigned secno, 
	}



	if (!(qbh->data = kmalloc(2048, GFP_NOFS))) {

		printk("HPFS: hpfs_get_4sectors: out of memory\n");

		pr_warn("HPFS: hpfs_get_4sectors: out of memory\n");

		goto bail4;

	}

	return qbh->data;

fs/hpfs/dir.c

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static loff_t hpfs_dir_lseek(struct file *filp, loff_t off, int whence) 
	mutex_lock(&i->i_mutex);

	hpfs_lock(s);



	/*printk("dir lseek\n");*/

	/*pr_info("dir lseek\n");*/

	if (new_off == 0 || new_off == 1 || new_off == 11 || new_off == 12 || new_off == 13) goto ok;

	pos = ((loff_t) hpfs_de_as_down_as_possible(s, hpfs_inode->i_dno) << 4) + 1;

	while (pos != new_off) {
@@ -51,7 +51,7 @@ static loff_t hpfs_dir_lseek(struct file *filp, loff_t off, int whence) 
	mutex_unlock(&i->i_mutex);

	return new_off;

fail:

	/*printk("illegal lseek: %016llx\n", new_off);*/

	/*pr_warn("illegal lseek: %016llx\n", new_off);*/

	hpfs_unlock(s);

	mutex_unlock(&i->i_mutex);

	return -ESPIPE;
@@ -127,7 +127,7 @@ static int hpfs_readdir(struct file *file, struct dir_context *ctx) 
		if (ctx->pos == 12)

			goto out;

		if (ctx->pos == 3 || ctx->pos == 4 || ctx->pos == 5) {

			printk("HPFS: warning: pos==%d\n",(int)ctx->pos);

			pr_warn("HPFS: warning: pos==%d\n", (int)ctx->pos);

			goto out;

		}

		if (ctx->pos == 0) {

fs/hpfs/dnode.c

+25 −17
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static loff_t get_pos(struct dnode *d, struct hpfs_dirent *fde) 
		if (de == fde) return ((loff_t) le32_to_cpu(d->self) << 4) | (loff_t)i;

		i++;

	}

	printk("HPFS: get_pos: not_found\n");

	pr_info("HPFS: get_pos: not_found\n");

	return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1;

}
@@ -32,7 +32,7 @@ void hpfs_add_pos(struct inode *inode, loff_t *pos) 
			if (hpfs_inode->i_rddir_off[i] == pos) return;

	if (!(i&0x0f)) {

		if (!(ppos = kmalloc((i+0x11) * sizeof(loff_t*), GFP_NOFS))) {

			printk("HPFS: out of memory for position list\n");

			pr_warn("HPFS: out of memory for position list\n");

			return;

		}

		if (hpfs_inode->i_rddir_off) {
@@ -63,7 +63,8 @@ void hpfs_del_pos(struct inode *inode, loff_t *pos) 
	}

	return;

	not_f:

	/*printk("HPFS: warning: position pointer %p->%08x not found\n", pos, (int)*pos);*/

	/*pr_info("HPFS: warning: position pointer %p->%08x not found\n",

		  pos, (int)*pos);*/

	return;

}
@@ -92,8 +93,11 @@ static void hpfs_pos_ins(loff_t *p, loff_t d, loff_t c) 
{

	if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) {

		int n = (*p & 0x3f) + c;

		if (n > 0x3f) printk("HPFS: hpfs_pos_ins: %08x + %d\n", (int)*p, (int)c >> 8);

		else *p = (*p & ~0x3f) | n;

		if (n > 0x3f)

			pr_warn("HPFS: hpfs_pos_ins: %08x + %d\n",

				(int)*p, (int)c >> 8);

		else

			*p = (*p & ~0x3f) | n;

	}

}
@@ -101,8 +105,11 @@ static void hpfs_pos_del(loff_t *p, loff_t d, loff_t c) 
{

	if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) {

		int n = (*p & 0x3f) - c;

		if (n < 1) printk("HPFS: hpfs_pos_ins: %08x - %d\n", (int)*p, (int)c >> 8);

		else *p = (*p & ~0x3f) | n;

		if (n < 1)

			pr_warn("HPFS: hpfs_pos_ins: %08x - %d\n",

				(int)*p, (int)c >> 8);

		else

			*p = (*p & ~0x3f) | n;

	}

}
@@ -239,7 +246,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, 
	struct fnode *fnode;

	int c1, c2 = 0;

	if (!(nname = kmalloc(256, GFP_NOFS))) {

		printk("HPFS: out of memory, can't add to dnode\n");

		pr_warn("HPFS: out of memory, can't add to dnode\n");

		return 1;

	}

	go_up:
@@ -281,7 +288,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno, 
		   not be any error while splitting dnodes, otherwise the

		   whole directory, not only file we're adding, would

		   be lost. */

		printk("HPFS: out of memory for dnode splitting\n");

		pr_warn("HPFS: out of memory for dnode splitting\n");

		hpfs_brelse4(&qbh);

		kfree(nname);

		return 1;
@@ -597,7 +604,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) 
		if (!de_next->down) goto endm;

		ndown = de_down_pointer(de_next);

		if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) {

			printk("HPFS: out of memory for dtree balancing\n");

			pr_warn("HPFS: out of memory for dtree balancing\n");

			goto endm;

		}

		memcpy(de_cp, de, le16_to_cpu(de->length));
@@ -612,7 +619,8 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) 
			hpfs_brelse4(&qbh1);

		}

		hpfs_add_to_dnode(i, ndown, de_cp->name, de_cp->namelen, de_cp, de_cp->down ? de_down_pointer(de_cp) : 0);

		/*printk("UP-TO-DNODE: %08x (ndown = %08x, down = %08x, dno = %08x)\n", up, ndown, down, dno);*/

		/*pr_info("UP-TO-DNODE: %08x (ndown = %08x, down = %08x, dno = %08x)\n",

		  up, ndown, down, dno);*/

		dno = up;

		kfree(de_cp);

		goto try_it_again;
@@ -637,15 +645,15 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) 
			if (!dlp && down) {

				if (le32_to_cpu(d1->first_free) > 2044) {

					if (hpfs_sb(i->i_sb)->sb_chk >= 2) {

						printk("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n");

						printk("HPFS: warning: terminating balancing operation\n");

						pr_warn("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n");

						pr_warn("HPFS: warning: terminating balancing operation\n");

					}

					hpfs_brelse4(&qbh1);

					goto endm;

				}

				if (hpfs_sb(i->i_sb)->sb_chk >= 2) {

					printk("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n");

					printk("HPFS: warning: goin'on\n");

					pr_warn("HPFS: warning: unbalanced dnode tree, see hpfs.txt 4 more info\n");

					pr_warn("HPFS: warning: goin'on\n");

				}

				le16_add_cpu(&del->length, 4);

				del->down = 1;
@@ -659,7 +667,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno) 
				*(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down);

		} else goto endm;

		if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) {

			printk("HPFS: out of memory for dtree balancing\n");

			pr_warn("HPFS: out of memory for dtree balancing\n");

			hpfs_brelse4(&qbh1);

			goto endm;

		}
@@ -1000,7 +1008,7 @@ struct hpfs_dirent *map_fnode_dirent(struct super_block *s, fnode_secno fno, 
	int d1, d2 = 0;

	name1 = f->name;

	if (!(name2 = kmalloc(256, GFP_NOFS))) {

		printk("HPFS: out of memory, can't map dirent\n");

		pr_warn("HPFS: out of memory, can't map dirent\n");

		return NULL;

	}

	if (f->len <= 15)

fs/hpfs/ea.c

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static char *get_indirect_ea(struct super_block *s, int ano, secno a, int size) 
{

	char *ret;

	if (!(ret = kmalloc(size + 1, GFP_NOFS))) {

		printk("HPFS: out of memory for EA\n");

		pr_warn("HPFS: out of memory for EA\n");

		return NULL;

	}

	if (hpfs_ea_read(s, a, ano, 0, size, ret)) {
@@ -139,7 +139,7 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si 
			if (ea_indirect(ea))

				return get_indirect_ea(s, ea_in_anode(ea), ea_sec(ea), *size = ea_len(ea));

			if (!(ret = kmalloc((*size = ea_valuelen(ea)) + 1, GFP_NOFS))) {

				printk("HPFS: out of memory for EA\n");

				pr_warn("HPFS: out of memory for EA\n");

				return NULL;

			}

			memcpy(ret, ea_data(ea), ea_valuelen(ea));
@@ -165,7 +165,7 @@ char *hpfs_get_ea(struct super_block *s, struct fnode *fnode, char *key, int *si 
			if (ea_indirect(ea))

				return get_indirect_ea(s, ea_in_anode(ea), ea_sec(ea), *size = ea_len(ea));

			if (!(ret = kmalloc((*size = ea_valuelen(ea)) + 1, GFP_NOFS))) {

				printk("HPFS: out of memory for EA\n");

				pr_warn("HPFS: out of memory for EA\n");

				return NULL;

			}

			if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea_valuelen(ea), ret)) {