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

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

fs/hpfs: use pr_fmt for logging 



Also remove redundant level names (warning:...)

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 b7cb1ce2

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 {

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

		pr_warn("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 {

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

		pr_warn("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) {

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

		pr_warn("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) {

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

		pr_warn("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) {

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

		pr_warn("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))) {

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

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

		goto bail4;

	}

	return qbh->data;

fs/hpfs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

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

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

			goto out;

		}

		if (ctx->pos == 0) {

fs/hpfs/dnode.c

+14 −14
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++;

	}

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

	pr_info("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))) {

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

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

			return;

		}

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

	return;

	not_f:

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

	/*pr_warn("position pointer %p->%08x not found\n",

		  pos, (int)*pos);*/

	return;

}
@@ -94,7 +94,7 @@ 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)

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

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

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

		else

			*p = (*p & ~0x3f) | n;
@@ -106,7 +106,7 @@ 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)

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

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

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

		else

			*p = (*p & ~0x3f) | n;
@@ -246,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))) {

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

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

		return 1;

	}

	go_up:
@@ -288,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. */

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

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

		hpfs_brelse4(&qbh);

		kfree(nname);

		return 1;
@@ -604,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))) {

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

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

			goto endm;

		}

		memcpy(de_cp, de, le16_to_cpu(de->length));
@@ -645,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) {

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

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

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

						pr_warn("terminating balancing operation\n");

					}

					hpfs_brelse4(&qbh1);

					goto endm;

				}

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

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

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

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

					pr_warn("goin'on\n");

				}

				le16_add_cpu(&del->length, 4);

				del->down = 1;
@@ -667,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))) {

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

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

			hpfs_brelse4(&qbh1);

			goto endm;

		}
@@ -1008,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))) {

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

		pr_warn("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))) {

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

		pr_warn("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))) {

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

				pr_warn("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))) {

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

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

				return NULL;

			}

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

fs/hpfs/hpfs_fn.h

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ 


//#define DBG

//#define DEBUG_LOCKS

#ifdef pr_fmt

#undef pr_fmt

#endif



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/mutex.h>

#include <linux/pagemap.h>