aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hpfs
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-06-06 17:36:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:08:10 -0400
commit1749a10e02a9c6ed1a5c0a2860fb9ed132f2cc42 (patch)
tree56089d573c7b423800af6af0ce6afaad123da6dd /fs/hpfs
parent14da17f9c4a880e3418f7f04071df3cb2e8636e8 (diff)
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>
Diffstat (limited to 'fs/hpfs')
-rw-r--r--fs/hpfs/buffer.c12
-rw-r--r--fs/hpfs/dnode.c12
2 files changed, 12 insertions, 12 deletions
diff --git a/fs/hpfs/buffer.c b/fs/hpfs/buffer.c
index e5f62d4cebd8..07e0b0fc4548 100644
--- a/fs/hpfs/buffer.c
+++ b/fs/hpfs/buffer.c
@@ -55,7 +55,7 @@ void *hpfs_map_sector(struct super_block *s, unsigned secno, struct buffer_head
55 if (bh != NULL) 55 if (bh != NULL)
56 return bh->b_data; 56 return bh->b_data;
57 else { 57 else {
58 pr_warn("hpfs_map_sector: read error\n"); 58 pr_warn("%s(): read error\n", __func__);
59 return NULL; 59 return NULL;
60 } 60 }
61} 61}
@@ -76,7 +76,7 @@ void *hpfs_get_sector(struct super_block *s, unsigned secno, struct buffer_head
76 set_buffer_uptodate(bh); 76 set_buffer_uptodate(bh);
77 return bh->b_data; 77 return bh->b_data;
78 } else { 78 } else {
79 pr_warn("hpfs_get_sector: getblk failed\n"); 79 pr_warn("%s(): getblk failed\n", __func__);
80 return NULL; 80 return NULL;
81 } 81 }
82} 82}
@@ -93,7 +93,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe
93 cond_resched(); 93 cond_resched();
94 94
95 if (secno & 3) { 95 if (secno & 3) {
96 pr_warn("hpfs_map_4sectors: unaligned read\n"); 96 pr_warn("%s(): unaligned read\n", __func__);
97 return NULL; 97 return NULL;
98 } 98 }
99 99
@@ -112,7 +112,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe
112 112
113 qbh->data = data = kmalloc(2048, GFP_NOFS); 113 qbh->data = data = kmalloc(2048, GFP_NOFS);
114 if (!data) { 114 if (!data) {
115 pr_warn("hpfs_map_4sectors: out of memory\n"); 115 pr_warn("%s(): out of memory\n", __func__);
116 goto bail4; 116 goto bail4;
117 } 117 }
118 118
@@ -145,7 +145,7 @@ void *hpfs_get_4sectors(struct super_block *s, unsigned secno,
145 hpfs_lock_assert(s); 145 hpfs_lock_assert(s);
146 146
147 if (secno & 3) { 147 if (secno & 3) {
148 pr_warn("hpfs_get_4sectors: unaligned read\n"); 148 pr_warn("%s(): unaligned read\n", __func__);
149 return NULL; 149 return NULL;
150 } 150 }
151 151
@@ -161,7 +161,7 @@ void *hpfs_get_4sectors(struct super_block *s, unsigned secno,
161 } 161 }
162 162
163 if (!(qbh->data = kmalloc(2048, GFP_NOFS))) { 163 if (!(qbh->data = kmalloc(2048, GFP_NOFS))) {
164 pr_warn("hpfs_get_4sectors: out of memory\n"); 164 pr_warn("%s(): out of memory\n", __func__);
165 goto bail4; 165 goto bail4;
166 } 166 }
167 return qbh->data; 167 return qbh->data;
diff --git a/fs/hpfs/dnode.c b/fs/hpfs/dnode.c
index 69554e208b26..d10c5e91c5b2 100644
--- a/fs/hpfs/dnode.c
+++ b/fs/hpfs/dnode.c
@@ -17,7 +17,7 @@ static loff_t get_pos(struct dnode *d, struct hpfs_dirent *fde)
17 if (de == fde) return ((loff_t) le32_to_cpu(d->self) << 4) | (loff_t)i; 17 if (de == fde) return ((loff_t) le32_to_cpu(d->self) << 4) | (loff_t)i;
18 i++; 18 i++;
19 } 19 }
20 pr_info("get_pos: not_found\n"); 20 pr_info("%s(): not_found\n", __func__);
21 return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1; 21 return ((loff_t)le32_to_cpu(d->self) << 4) | (loff_t)1;
22} 22}
23 23
@@ -94,8 +94,8 @@ static void hpfs_pos_ins(loff_t *p, loff_t d, loff_t c)
94 if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { 94 if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) {
95 int n = (*p & 0x3f) + c; 95 int n = (*p & 0x3f) + c;
96 if (n > 0x3f) 96 if (n > 0x3f)
97 pr_warn("hpfs_pos_ins: %08x + %d\n", 97 pr_warn("%s(): %08x + %d\n",
98 (int)*p, (int)c >> 8); 98 __func__, (int)*p, (int)c >> 8);
99 else 99 else
100 *p = (*p & ~0x3f) | n; 100 *p = (*p & ~0x3f) | n;
101 } 101 }
@@ -106,8 +106,8 @@ static void hpfs_pos_del(loff_t *p, loff_t d, loff_t c)
106 if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) { 106 if ((*p & ~0x3f) == (d & ~0x3f) && (*p & 0x3f) >= (d & 0x3f)) {
107 int n = (*p & 0x3f) - c; 107 int n = (*p & 0x3f) - c;
108 if (n < 1) 108 if (n < 1)
109 pr_warn("hpfs_pos_ins: %08x - %d\n", 109 pr_warn("%s(): %08x - %d\n",
110 (int)*p, (int)c >> 8); 110 __func__, (int)*p, (int)c >> 8);
111 else 111 else
112 *p = (*p & ~0x3f) | n; 112 *p = (*p & ~0x3f) | n;
113 } 113 }
@@ -251,7 +251,7 @@ static int hpfs_add_to_dnode(struct inode *i, dnode_secno dno,
251 } 251 }
252 go_up: 252 go_up:
253 if (namelen >= 256) { 253 if (namelen >= 256) {
254 hpfs_error(i->i_sb, "hpfs_add_to_dnode: namelen == %d", namelen); 254 hpfs_error(i->i_sb, "%s(): namelen == %d", __func__, namelen);
255 kfree(nd); 255 kfree(nd);
256 kfree(nname); 256 kfree(nname);
257 return 1; 257 return 1;