aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hfsplus/dir.c
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-01-18 20:43:05 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 22:20:22 -0500
commit634725a92938b0f282b17cec0b007dca77adebd2 (patch)
treec4dacf0c74ae3d322c37c010ee5cada2280eccca /fs/hfsplus/dir.c
parent5131cf154ad1c6e584efa58d17a469d0b80f49bd (diff)
[PATCH] hfs: cleanup HFS+ prints
Add the log level and a "hfs: " prefix to all kernel prints. (HFS and HFS+ will use the same prefix, as they share some code and could be merged at some point.) Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/hfsplus/dir.c')
-rw-r--r--fs/hfsplus/dir.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 50c8f44b6c66..82c223765478 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -84,7 +84,7 @@ again:
84 } else if (!dentry->d_fsdata) 84 } else if (!dentry->d_fsdata)
85 dentry->d_fsdata = (void *)(unsigned long)cnid; 85 dentry->d_fsdata = (void *)(unsigned long)cnid;
86 } else { 86 } else {
87 printk("HFS+-fs: Illegal catalog entry type in lookup\n"); 87 printk(KERN_ERR "hfs: invalid catalog entry type in lookup\n");
88 err = -EIO; 88 err = -EIO;
89 goto fail; 89 goto fail;
90 } 90 }
@@ -132,12 +132,12 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
132 case 1: 132 case 1:
133 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, fd.entrylength); 133 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, fd.entrylength);
134 if (be16_to_cpu(entry.type) != HFSPLUS_FOLDER_THREAD) { 134 if (be16_to_cpu(entry.type) != HFSPLUS_FOLDER_THREAD) {
135 printk("HFS+-fs: bad catalog folder thread\n"); 135 printk(KERN_ERR "hfs: bad catalog folder thread\n");
136 err = -EIO; 136 err = -EIO;
137 goto out; 137 goto out;
138 } 138 }
139 if (fd.entrylength < HFSPLUS_MIN_THREAD_SZ) { 139 if (fd.entrylength < HFSPLUS_MIN_THREAD_SZ) {
140 printk("HFS+-fs: truncated catalog thread\n"); 140 printk(KERN_ERR "hfs: truncated catalog thread\n");
141 err = -EIO; 141 err = -EIO;
142 goto out; 142 goto out;
143 } 143 }
@@ -156,7 +156,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
156 156
157 for (;;) { 157 for (;;) {
158 if (be32_to_cpu(fd.key->cat.parent) != inode->i_ino) { 158 if (be32_to_cpu(fd.key->cat.parent) != inode->i_ino) {
159 printk("HFS+-fs: walked past end of dir\n"); 159 printk(KERN_ERR "hfs: walked past end of dir\n");
160 err = -EIO; 160 err = -EIO;
161 goto out; 161 goto out;
162 } 162 }
@@ -168,7 +168,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
168 goto out; 168 goto out;
169 if (type == HFSPLUS_FOLDER) { 169 if (type == HFSPLUS_FOLDER) {
170 if (fd.entrylength < sizeof(struct hfsplus_cat_folder)) { 170 if (fd.entrylength < sizeof(struct hfsplus_cat_folder)) {
171 printk("HFS+-fs: small dir entry\n"); 171 printk(KERN_ERR "hfs: small dir entry\n");
172 err = -EIO; 172 err = -EIO;
173 goto out; 173 goto out;
174 } 174 }
@@ -180,7 +180,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
180 break; 180 break;
181 } else if (type == HFSPLUS_FILE) { 181 } else if (type == HFSPLUS_FILE) {
182 if (fd.entrylength < sizeof(struct hfsplus_cat_file)) { 182 if (fd.entrylength < sizeof(struct hfsplus_cat_file)) {
183 printk("HFS+-fs: small file entry\n"); 183 printk(KERN_ERR "hfs: small file entry\n");
184 err = -EIO; 184 err = -EIO;
185 goto out; 185 goto out;
186 } 186 }
@@ -188,7 +188,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
188 be32_to_cpu(entry.file.id), DT_REG)) 188 be32_to_cpu(entry.file.id), DT_REG))
189 break; 189 break;
190 } else { 190 } else {
191 printk("HFS+-fs: bad catalog entry type\n"); 191 printk(KERN_ERR "hfs: bad catalog entry type\n");
192 err = -EIO; 192 err = -EIO;
193 goto out; 193 goto out;
194 } 194 }