diff options
Diffstat (limited to 'fs/hfs/mdb.c')
-rw-r--r-- | fs/hfs/mdb.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/hfs/mdb.c b/fs/hfs/mdb.c index 0a473f79c89f..b4651e128d7f 100644 --- a/fs/hfs/mdb.c +++ b/fs/hfs/mdb.c | |||
@@ -47,7 +47,7 @@ static int hfs_get_last_session(struct super_block *sb, | |||
47 | *start = (sector_t)te.cdte_addr.lba << 2; | 47 | *start = (sector_t)te.cdte_addr.lba << 2; |
48 | return 0; | 48 | return 0; |
49 | } | 49 | } |
50 | printk(KERN_ERR "HFS: Invalid session number or type of track\n"); | 50 | printk(KERN_ERR "hfs: invalid session number or type of track\n"); |
51 | return -EINVAL; | 51 | return -EINVAL; |
52 | } | 52 | } |
53 | ms_info.addr_format = CDROM_LBA; | 53 | ms_info.addr_format = CDROM_LBA; |
@@ -100,7 +100,7 @@ int hfs_mdb_get(struct super_block *sb) | |||
100 | 100 | ||
101 | HFS_SB(sb)->alloc_blksz = size = be32_to_cpu(mdb->drAlBlkSiz); | 101 | HFS_SB(sb)->alloc_blksz = size = be32_to_cpu(mdb->drAlBlkSiz); |
102 | if (!size || (size & (HFS_SECTOR_SIZE - 1))) { | 102 | if (!size || (size & (HFS_SECTOR_SIZE - 1))) { |
103 | hfs_warn("hfs_fs: bad allocation block size %d\n", size); | 103 | printk(KERN_ERR "hfs: bad allocation block size %d\n", size); |
104 | goto out_bh; | 104 | goto out_bh; |
105 | } | 105 | } |
106 | 106 | ||
@@ -117,7 +117,7 @@ int hfs_mdb_get(struct super_block *sb) | |||
117 | size >>= 1; | 117 | size >>= 1; |
118 | brelse(bh); | 118 | brelse(bh); |
119 | if (!sb_set_blocksize(sb, size)) { | 119 | if (!sb_set_blocksize(sb, size)) { |
120 | printk("hfs_fs: unable to set blocksize to %u\n", size); | 120 | printk(KERN_ERR "hfs: unable to set blocksize to %u\n", size); |
121 | goto out; | 121 | goto out; |
122 | } | 122 | } |
123 | 123 | ||
@@ -161,8 +161,8 @@ int hfs_mdb_get(struct super_block *sb) | |||
161 | } | 161 | } |
162 | 162 | ||
163 | if (!HFS_SB(sb)->alt_mdb) { | 163 | if (!HFS_SB(sb)->alt_mdb) { |
164 | hfs_warn("hfs_fs: unable to locate alternate MDB\n"); | 164 | printk(KERN_WARNING "hfs: unable to locate alternate MDB\n"); |
165 | hfs_warn("hfs_fs: continuing without an alternate MDB\n"); | 165 | printk(KERN_WARNING "hfs: continuing without an alternate MDB\n"); |
166 | } | 166 | } |
167 | 167 | ||
168 | HFS_SB(sb)->bitmap = (__be32 *)__get_free_pages(GFP_KERNEL, PAGE_SIZE < 8192 ? 1 : 0); | 168 | HFS_SB(sb)->bitmap = (__be32 *)__get_free_pages(GFP_KERNEL, PAGE_SIZE < 8192 ? 1 : 0); |
@@ -177,7 +177,7 @@ int hfs_mdb_get(struct super_block *sb) | |||
177 | while (size) { | 177 | while (size) { |
178 | bh = sb_bread(sb, off >> sb->s_blocksize_bits); | 178 | bh = sb_bread(sb, off >> sb->s_blocksize_bits); |
179 | if (!bh) { | 179 | if (!bh) { |
180 | hfs_warn("hfs_fs: unable to read volume bitmap\n"); | 180 | printk(KERN_ERR "hfs: unable to read volume bitmap\n"); |
181 | goto out; | 181 | goto out; |
182 | } | 182 | } |
183 | off2 = off & (sb->s_blocksize - 1); | 183 | off2 = off & (sb->s_blocksize - 1); |
@@ -191,23 +191,23 @@ int hfs_mdb_get(struct super_block *sb) | |||
191 | 191 | ||
192 | HFS_SB(sb)->ext_tree = hfs_btree_open(sb, HFS_EXT_CNID, hfs_ext_keycmp); | 192 | HFS_SB(sb)->ext_tree = hfs_btree_open(sb, HFS_EXT_CNID, hfs_ext_keycmp); |
193 | if (!HFS_SB(sb)->ext_tree) { | 193 | if (!HFS_SB(sb)->ext_tree) { |
194 | hfs_warn("hfs_fs: unable to open extent tree\n"); | 194 | printk(KERN_ERR "hfs: unable to open extent tree\n"); |
195 | goto out; | 195 | goto out; |
196 | } | 196 | } |
197 | HFS_SB(sb)->cat_tree = hfs_btree_open(sb, HFS_CAT_CNID, hfs_cat_keycmp); | 197 | HFS_SB(sb)->cat_tree = hfs_btree_open(sb, HFS_CAT_CNID, hfs_cat_keycmp); |
198 | if (!HFS_SB(sb)->cat_tree) { | 198 | if (!HFS_SB(sb)->cat_tree) { |
199 | hfs_warn("hfs_fs: unable to open catalog tree\n"); | 199 | printk(KERN_ERR "hfs: unable to open catalog tree\n"); |
200 | goto out; | 200 | goto out; |
201 | } | 201 | } |
202 | 202 | ||
203 | attrib = mdb->drAtrb; | 203 | attrib = mdb->drAtrb; |
204 | if (!(attrib & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) { | 204 | if (!(attrib & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) { |
205 | hfs_warn("HFS-fs warning: Filesystem was not cleanly unmounted, " | 205 | printk(KERN_WARNING "hfs: filesystem was not cleanly unmounted, " |
206 | "running fsck.hfs is recommended. mounting read-only.\n"); | 206 | "running fsck.hfs is recommended. mounting read-only.\n"); |
207 | sb->s_flags |= MS_RDONLY; | 207 | sb->s_flags |= MS_RDONLY; |
208 | } | 208 | } |
209 | if ((attrib & cpu_to_be16(HFS_SB_ATTRIB_SLOCK))) { | 209 | if ((attrib & cpu_to_be16(HFS_SB_ATTRIB_SLOCK))) { |
210 | hfs_warn("HFS-fs: Filesystem is marked locked, mounting read-only.\n"); | 210 | printk(KERN_WARNING "hfs: filesystem is marked locked, mounting read-only.\n"); |
211 | sb->s_flags |= MS_RDONLY; | 211 | sb->s_flags |= MS_RDONLY; |
212 | } | 212 | } |
213 | if (!(sb->s_flags & MS_RDONLY)) { | 213 | if (!(sb->s_flags & MS_RDONLY)) { |
@@ -303,7 +303,7 @@ void hfs_mdb_commit(struct super_block *sb) | |||
303 | while (size) { | 303 | while (size) { |
304 | bh = sb_bread(sb, block); | 304 | bh = sb_bread(sb, block); |
305 | if (!bh) { | 305 | if (!bh) { |
306 | hfs_warn("hfs_fs: unable to read volume bitmap\n"); | 306 | printk(KERN_ERR "hfs: unable to read volume bitmap\n"); |
307 | break; | 307 | break; |
308 | } | 308 | } |
309 | len = min((int)sb->s_blocksize - off, size); | 309 | len = min((int)sb->s_blocksize - off, size); |