fs/hpfs: increase pr_warn level (a19189e5) · Commits · e / devices / android_kernel_fairphone_FP3

fs/hpfs/buffer.c

+6 −6

Original line number	Original line	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)		if (bh != NULL)
	return bh->b_data;		return bh->b_data;
	else {		else {
	pr_warn("%s(): read error\n", __func__);		pr_err("%s(): read error\n", __func__);
	return NULL;		return NULL;
	}		}
	}		}
	@@ -76,7 +76,7 @@ void hpfs_get_sector(struct super_block s, unsigned secno, struct buffer_head
	set_buffer_uptodate(bh);		set_buffer_uptodate(bh);
	return bh->b_data;		return bh->b_data;
	} else {		} else {
	pr_warn("%s(): getblk failed\n", __func__);		pr_err("%s(): getblk failed\n", __func__);
	return NULL;		return NULL;
	}		}
	}		}
	@@ -93,7 +93,7 @@ void hpfs_map_4sectors(struct super_block s, unsigned secno, struct quad_buffe
	cond_resched();		cond_resched();

	if (secno & 3) {		if (secno & 3) {
	pr_warn("%s(): unaligned read\n", __func__);		pr_err("%s(): unaligned read\n", __func__);
	return NULL;		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);		qbh->data = data = kmalloc(2048, GFP_NOFS);
	if (!data) {		if (!data) {
	pr_warn("%s(): out of memory\n", __func__);		pr_err("%s(): out of memory\n", __func__);
	goto bail4;		goto bail4;
	}		}

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

	if (secno & 3) {		if (secno & 3) {
	pr_warn("%s(): unaligned read\n", __func__);		pr_err("%s(): unaligned read\n", __func__);
	return NULL;		return NULL;
	}		}

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

	if (!(qbh->data = kmalloc(2048, GFP_NOFS))) {		if (!(qbh->data = kmalloc(2048, GFP_NOFS))) {
	pr_warn("%s(): out of memory\n", __func__);		pr_err("%s(): out of memory\n", __func__);
	goto bail4;		goto bail4;
	}		}
	return qbh->data;		return qbh->data;

fs/hpfs/dir.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -127,7 +127,7 @@ static int hpfs_readdir(struct file file, struct dir_context ctx)
	if (ctx->pos == 12)		if (ctx->pos == 12)
	goto out;		goto out;
	if (ctx->pos == 3 \|\| ctx->pos == 4 \|\| ctx->pos == 5) {		if (ctx->pos == 3 \|\| ctx->pos == 4 \|\| ctx->pos == 5) {
	pr_warn("pos==%d\n", (int)ctx->pos);		pr_err("pos==%d\n", (int)ctx->pos);
	goto out;		goto out;
	}		}
	if (ctx->pos == 0) {		if (ctx->pos == 0) {

fs/hpfs/dnode.c

+12 −12

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ void hpfs_add_pos(struct inode inode, loff_t pos)
	if (hpfs_inode->i_rddir_off[i] == pos) return;		if (hpfs_inode->i_rddir_off[i] == pos) return;
	if (!(i&0x0f)) {		if (!(i&0x0f)) {
	if (!(ppos = kmalloc((i+0x11) * sizeof(loff_t*), GFP_NOFS))) {		if (!(ppos = kmalloc((i+0x11) * sizeof(loff_t*), GFP_NOFS))) {
	pr_warn("out of memory for position list\n");		pr_err("out of memory for position list\n");
	return;		return;
	}		}
	if (hpfs_inode->i_rddir_off) {		if (hpfs_inode->i_rddir_off) {
	@@ -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)) {		if ((p & ~0x3f) == (d & ~0x3f) && (p & 0x3f) >= (d & 0x3f)) {
	int n = (*p & 0x3f) + c;		int n = (*p & 0x3f) + c;
	if (n > 0x3f)		if (n > 0x3f)
	pr_warn("%s(): %08x + %d\n",		pr_err("%s(): %08x + %d\n",
	__func__, (int)*p, (int)c >> 8);		__func__, (int)*p, (int)c >> 8);
	else		else
	p = (p & ~0x3f) \| n;		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)) {		if ((p & ~0x3f) == (d & ~0x3f) && (p & 0x3f) >= (d & 0x3f)) {
	int n = (*p & 0x3f) - c;		int n = (*p & 0x3f) - c;
	if (n < 1)		if (n < 1)
	pr_warn("%s(): %08x - %d\n",		pr_err("%s(): %08x - %d\n",
	__func__, (int)*p, (int)c >> 8);		__func__, (int)*p, (int)c >> 8);
	else		else
	p = (p & ~0x3f) \| n;		p = (p & ~0x3f) \| n;
	@@ -246,7 +246,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
	struct fnode *fnode;		struct fnode *fnode;
	int c1, c2 = 0;		int c1, c2 = 0;
	if (!(nname = kmalloc(256, GFP_NOFS))) {		if (!(nname = kmalloc(256, GFP_NOFS))) {
	pr_warn("out of memory, can't add to dnode\n");		pr_err("out of memory, can't add to dnode\n");
	return 1;		return 1;
	}		}
	go_up:		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		not be any error while splitting dnodes, otherwise the
	whole directory, not only file we're adding, would		whole directory, not only file we're adding, would
	be lost. */		be lost. */
	pr_warn("out of memory for dnode splitting\n");		pr_err("out of memory for dnode splitting\n");
	hpfs_brelse4(&qbh);		hpfs_brelse4(&qbh);
	kfree(nname);		kfree(nname);
	return 1;		return 1;
	@@ -604,7 +604,7 @@ static void delete_empty_dnode(struct inode *i, dnode_secno dno)
	if (!de_next->down) goto endm;		if (!de_next->down) goto endm;
	ndown = de_down_pointer(de_next);		ndown = de_down_pointer(de_next);
	if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) {		if (!(de_cp = kmalloc(le16_to_cpu(de->length), GFP_NOFS))) {
	pr_warn("out of memory for dtree balancing\n");		pr_err("out of memory for dtree balancing\n");
	goto endm;		goto endm;
	}		}
	memcpy(de_cp, de, le16_to_cpu(de->length));		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 (!dlp && down) {
	if (le32_to_cpu(d1->first_free) > 2044) {		if (le32_to_cpu(d1->first_free) > 2044) {
	if (hpfs_sb(i->i_sb)->sb_chk >= 2) {		if (hpfs_sb(i->i_sb)->sb_chk >= 2) {
	pr_warn("unbalanced dnode tree, see hpfs.txt 4 more info\n");		pr_err("unbalanced dnode tree, see hpfs.txt 4 more info\n");
	pr_warn("terminating balancing operation\n");		pr_err("terminating balancing operation\n");
	}		}
	hpfs_brelse4(&qbh1);		hpfs_brelse4(&qbh1);
	goto endm;		goto endm;
	}		}
	if (hpfs_sb(i->i_sb)->sb_chk >= 2) {		if (hpfs_sb(i->i_sb)->sb_chk >= 2) {
	pr_warn("unbalanced dnode tree, see hpfs.txt 4 more info\n");		pr_err("unbalanced dnode tree, see hpfs.txt 4 more info\n");
	pr_warn("goin'on\n");		pr_err("goin'on\n");
	}		}
	le16_add_cpu(&del->length, 4);		le16_add_cpu(&del->length, 4);
	del->down = 1;		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);		(__le32 ) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down);
	} else goto endm;		} else goto endm;
	if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) {		if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) {
	pr_warn("out of memory for dtree balancing\n");		pr_err("out of memory for dtree balancing\n");
	hpfs_brelse4(&qbh1);		hpfs_brelse4(&qbh1);
	goto endm;		goto endm;
	}		}
	@@ -1008,7 +1008,7 @@ struct hpfs_dirent map_fnode_dirent(struct super_block s, fnode_secno fno,
	int d1, d2 = 0;		int d1, d2 = 0;
	name1 = f->name;		name1 = f->name;
	if (!(name2 = kmalloc(256, GFP_NOFS))) {		if (!(name2 = kmalloc(256, GFP_NOFS))) {
	pr_warn("out of memory, can't map dirent\n");		pr_err("out of memory, can't map dirent\n");
	return NULL;		return NULL;
	}		}
	if (f->len <= 15)		if (f->len <= 15)

fs/hpfs/ea.c

+3 −3

Original line number	Original line	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;		char *ret;
	if (!(ret = kmalloc(size + 1, GFP_NOFS))) {		if (!(ret = kmalloc(size + 1, GFP_NOFS))) {
	pr_warn("out of memory for EA\n");		pr_err("out of memory for EA\n");
	return NULL;		return NULL;
	}		}
	if (hpfs_ea_read(s, a, ano, 0, size, ret)) {		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))		if (ea_indirect(ea))
	return get_indirect_ea(s, ea_in_anode(ea), ea_sec(ea), *size = ea_len(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))) {		if (!(ret = kmalloc((*size = ea_valuelen(ea)) + 1, GFP_NOFS))) {
	pr_warn("out of memory for EA\n");		pr_err("out of memory for EA\n");
	return NULL;		return NULL;
	}		}
	memcpy(ret, ea_data(ea), ea_valuelen(ea));		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))		if (ea_indirect(ea))
	return get_indirect_ea(s, ea_in_anode(ea), ea_sec(ea), *size = ea_len(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))) {		if (!(ret = kmalloc((*size = ea_valuelen(ea)) + 1, GFP_NOFS))) {
	pr_warn("out of memory for EA\n");		pr_err("out of memory for EA\n");
	return NULL;		return NULL;
	}		}
	if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea_valuelen(ea), ret)) {		if (hpfs_ea_read(s, a, ano, pos + 4 + ea->namelen + 1, ea_valuelen(ea), ret)) {

fs/hpfs/inode.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -184,7 +184,7 @@ void hpfs_write_inode(struct inode *i)
	if (i->i_ino == hpfs_sb(i->i_sb)->sb_root) return;		if (i->i_ino == hpfs_sb(i->i_sb)->sb_root) return;
	if (hpfs_inode->i_rddir_off && !atomic_read(&i->i_count)) {		if (hpfs_inode->i_rddir_off && !atomic_read(&i->i_count)) {
	if (*hpfs_inode->i_rddir_off)		if (*hpfs_inode->i_rddir_off)
	pr_warn("write_inode: some position still there\n");		pr_err("write_inode: some position still there\n");
	kfree(hpfs_inode->i_rddir_off);		kfree(hpfs_inode->i_rddir_off);
	hpfs_inode->i_rddir_off = NULL;		hpfs_inode->i_rddir_off = NULL;
	}		}