udf: Convert printks to pr_<level>
Use the current logging styles. Convert a few printks that should have been udf_warn and udf_err. Coalesce formats. Add #define pr_fmt. Move an #include "udfdecls.h" above other includes in udftime.c so pr_fmt works correctly. Strip prefixes from conversions as appropriate. Reorder logging definitions in udfdecl.h Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
@@ -95,23 +95,21 @@ void udf_truncate_tail_extent(struct inode *inode)
|
||||
lbcount += elen;
|
||||
if (lbcount > inode->i_size) {
|
||||
if (lbcount - inode->i_size >= inode->i_sb->s_blocksize)
|
||||
printk(KERN_WARNING
|
||||
"udf_truncate_tail_extent(): Too long "
|
||||
"extent after EOF in inode %u: i_size: "
|
||||
"%Ld lbcount: %Ld extent %u+%u\n",
|
||||
(unsigned)inode->i_ino,
|
||||
(long long)inode->i_size,
|
||||
(long long)lbcount,
|
||||
(unsigned)eloc.logicalBlockNum,
|
||||
(unsigned)elen);
|
||||
udf_warn(inode->i_sb,
|
||||
"Too long extent after EOF in inode %u: i_size: %lld lbcount: %lld extent %u+%u\n",
|
||||
(unsigned)inode->i_ino,
|
||||
(long long)inode->i_size,
|
||||
(long long)lbcount,
|
||||
(unsigned)eloc.logicalBlockNum,
|
||||
(unsigned)elen);
|
||||
nelen = elen - (lbcount - inode->i_size);
|
||||
epos.offset -= adsize;
|
||||
extent_trunc(inode, &epos, &eloc, etype, elen, nelen);
|
||||
epos.offset += adsize;
|
||||
if (udf_next_aext(inode, &epos, &eloc, &elen, 1) != -1)
|
||||
printk(KERN_ERR "udf_truncate_tail_extent(): "
|
||||
"Extent after EOF in inode %u.\n",
|
||||
(unsigned)inode->i_ino);
|
||||
udf_err(inode->i_sb,
|
||||
"Extent after EOF in inode %u\n",
|
||||
(unsigned)inode->i_ino);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user