projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ecryptfs-3.10-rc5-msync' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
hfs
/
mdb.c
diff --git
a/fs/hfs/mdb.c
b/fs/hfs/mdb.c
index b7ec224910c5d7bda2f36432260fa6a6050d76d4..aa3f0d6d043c32f7b52293640daa3ad6c875821b 100644
(file)
--- a/
fs/hfs/mdb.c
+++ b/
fs/hfs/mdb.c
@@
-48,7
+48,7
@@
static int hfs_get_last_session(struct super_block *sb,
*start = (sector_t)te.cdte_addr.lba << 2;
return 0;
}
*start = (sector_t)te.cdte_addr.lba << 2;
return 0;
}
- pr
intk(KERN_ERR "hfs:
invalid session number or type of track\n");
+ pr
_err("
invalid session number or type of track\n");
return -EINVAL;
}
ms_info.addr_format = CDROM_LBA;
return -EINVAL;
}
ms_info.addr_format = CDROM_LBA;
@@
-101,7
+101,7
@@
int hfs_mdb_get(struct super_block *sb)
HFS_SB(sb)->alloc_blksz = size = be32_to_cpu(mdb->drAlBlkSiz);
if (!size || (size & (HFS_SECTOR_SIZE - 1))) {
HFS_SB(sb)->alloc_blksz = size = be32_to_cpu(mdb->drAlBlkSiz);
if (!size || (size & (HFS_SECTOR_SIZE - 1))) {
- pr
intk(KERN_ERR "hfs:
bad allocation block size %d\n", size);
+ pr
_err("
bad allocation block size %d\n", size);
goto out_bh;
}
goto out_bh;
}
@@
-118,7
+118,7
@@
int hfs_mdb_get(struct super_block *sb)
size >>= 1;
brelse(bh);
if (!sb_set_blocksize(sb, size)) {
size >>= 1;
brelse(bh);
if (!sb_set_blocksize(sb, size)) {
- pr
intk(KERN_ERR "hfs:
unable to set blocksize to %u\n", size);
+ pr
_err("
unable to set blocksize to %u\n", size);
goto out;
}
goto out;
}
@@
-162,8
+162,8
@@
int hfs_mdb_get(struct super_block *sb)
}
if (!HFS_SB(sb)->alt_mdb) {
}
if (!HFS_SB(sb)->alt_mdb) {
- pr
intk(KERN_WARNING "hfs:
unable to locate alternate MDB\n");
- pr
intk(KERN_WARNING "hfs:
continuing without an alternate MDB\n");
+ pr
_warn("
unable to locate alternate MDB\n");
+ pr
_warn("
continuing without an alternate MDB\n");
}
HFS_SB(sb)->bitmap = (__be32 *)__get_free_pages(GFP_KERNEL, PAGE_SIZE < 8192 ? 1 : 0);
}
HFS_SB(sb)->bitmap = (__be32 *)__get_free_pages(GFP_KERNEL, PAGE_SIZE < 8192 ? 1 : 0);
@@
-178,7
+178,7
@@
int hfs_mdb_get(struct super_block *sb)
while (size) {
bh = sb_bread(sb, off >> sb->s_blocksize_bits);
if (!bh) {
while (size) {
bh = sb_bread(sb, off >> sb->s_blocksize_bits);
if (!bh) {
- pr
intk(KERN_ERR "hfs:
unable to read volume bitmap\n");
+ pr
_err("
unable to read volume bitmap\n");
goto out;
}
off2 = off & (sb->s_blocksize - 1);
goto out;
}
off2 = off & (sb->s_blocksize - 1);
@@
-192,23
+192,22
@@
int hfs_mdb_get(struct super_block *sb)
HFS_SB(sb)->ext_tree = hfs_btree_open(sb, HFS_EXT_CNID, hfs_ext_keycmp);
if (!HFS_SB(sb)->ext_tree) {
HFS_SB(sb)->ext_tree = hfs_btree_open(sb, HFS_EXT_CNID, hfs_ext_keycmp);
if (!HFS_SB(sb)->ext_tree) {
- pr
intk(KERN_ERR "hfs:
unable to open extent tree\n");
+ pr
_err("
unable to open extent tree\n");
goto out;
}
HFS_SB(sb)->cat_tree = hfs_btree_open(sb, HFS_CAT_CNID, hfs_cat_keycmp);
if (!HFS_SB(sb)->cat_tree) {
goto out;
}
HFS_SB(sb)->cat_tree = hfs_btree_open(sb, HFS_CAT_CNID, hfs_cat_keycmp);
if (!HFS_SB(sb)->cat_tree) {
- pr
intk(KERN_ERR "hfs:
unable to open catalog tree\n");
+ pr
_err("
unable to open catalog tree\n");
goto out;
}
attrib = mdb->drAtrb;
if (!(attrib & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) {
goto out;
}
attrib = mdb->drAtrb;
if (!(attrib & cpu_to_be16(HFS_SB_ATTRIB_UNMNT))) {
- printk(KERN_WARNING "hfs: filesystem was not cleanly unmounted, "
- "running fsck.hfs is recommended. mounting read-only.\n");
+ pr_warn("filesystem was not cleanly unmounted, running fsck.hfs is recommended. mounting read-only.\n");
sb->s_flags |= MS_RDONLY;
}
if ((attrib & cpu_to_be16(HFS_SB_ATTRIB_SLOCK))) {
sb->s_flags |= MS_RDONLY;
}
if ((attrib & cpu_to_be16(HFS_SB_ATTRIB_SLOCK))) {
- pr
intk(KERN_WARNING "hfs:
filesystem is marked locked, mounting read-only.\n");
+ pr
_warn("
filesystem is marked locked, mounting read-only.\n");
sb->s_flags |= MS_RDONLY;
}
if (!(sb->s_flags & MS_RDONLY)) {
sb->s_flags |= MS_RDONLY;
}
if (!(sb->s_flags & MS_RDONLY)) {
@@
-312,7
+311,7
@@
void hfs_mdb_commit(struct super_block *sb)
while (size) {
bh = sb_bread(sb, block);
if (!bh) {
while (size) {
bh = sb_bread(sb, block);
if (!bh) {
- pr
intk(KERN_ERR "hfs:
unable to read volume bitmap\n");
+ pr
_err("
unable to read volume bitmap\n");
break;
}
len = min((int)sb->s_blocksize - off, size);
break;
}
len = min((int)sb->s_blocksize - off, size);