fs/hpfs: use __func__ for logging

Normalize function display fx() using __func__

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
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-06 14:36:35 -07:00 коммит произвёл Linus Torvalds
Родитель 14da17f9c4
Коммит 1749a10e02
2 изменённых файлов: 12 добавлений и 12 удалений

Просмотреть файл

@ -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("hpfs_map_sector: read error\n"); pr_warn("%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("hpfs_get_sector: getblk failed\n"); pr_warn("%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("hpfs_map_4sectors: unaligned read\n"); pr_warn("%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("hpfs_map_4sectors: out of memory\n"); pr_warn("%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("hpfs_get_4sectors: unaligned read\n"); pr_warn("%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("hpfs_get_4sectors: out of memory\n"); pr_warn("%s(): out of memory\n", __func__);
goto bail4; goto bail4;
} }
return qbh->data; return qbh->data;

Просмотреть файл

@ -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; if (de == fde) return ((loff_t) le32_to_cpu(d->self) << 4) | (loff_t)i;
i++; i++;
} }
pr_info("get_pos: not_found\n"); pr_info("%s(): not_found\n", __func__);
return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1; return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1;
} }
@ -94,8 +94,8 @@ 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("hpfs_pos_ins: %08x + %d\n", pr_warn("%s(): %08x + %d\n",
(int)*p, (int)c >> 8); __func__, (int)*p, (int)c >> 8);
else else
*p = (*p & ~0x3f) | n; *p = (*p & ~0x3f) | n;
} }
@ -106,8 +106,8 @@ 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("hpfs_pos_ins: %08x - %d\n", pr_warn("%s(): %08x - %d\n",
(int)*p, (int)c >> 8); __func__, (int)*p, (int)c >> 8);
else else
*p = (*p & ~0x3f) | n; *p = (*p & ~0x3f) | n;
} }
@ -251,7 +251,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
} }
go_up: go_up:
if (namelen >= 256) { if (namelen >= 256) {
hpfs_error(i->i_sb, "hpfs_add_to_dnode: namelen == %d", namelen); hpfs_error(i->i_sb, "%s(): namelen == %d", __func__, namelen);
kfree(nd); kfree(nd);
kfree(nname); kfree(nname);
return 1; return 1;