|
@@ -63,8 +63,7 @@
|
|
static const struct super_operations btrfs_super_ops;
|
|
static const struct super_operations btrfs_super_ops;
|
|
static struct file_system_type btrfs_fs_type;
|
|
static struct file_system_type btrfs_fs_type;
|
|
|
|
|
|
-static const char *btrfs_decode_error(struct btrfs_fs_info *fs_info, int errno,
|
|
|
|
- char nbuf[16])
|
|
|
|
|
|
+static const char *btrfs_decode_error(int errno, char nbuf[16])
|
|
{
|
|
{
|
|
char *errstr = NULL;
|
|
char *errstr = NULL;
|
|
|
|
|
|
@@ -152,7 +151,7 @@ void __btrfs_std_error(struct btrfs_fs_info *fs_info, const char *function,
|
|
if (errno == -EROFS && (sb->s_flags & MS_RDONLY))
|
|
if (errno == -EROFS && (sb->s_flags & MS_RDONLY))
|
|
return;
|
|
return;
|
|
|
|
|
|
- errstr = btrfs_decode_error(fs_info, errno, nbuf);
|
|
|
|
|
|
+ errstr = btrfs_decode_error(errno, nbuf);
|
|
if (fmt) {
|
|
if (fmt) {
|
|
struct va_format vaf = {
|
|
struct va_format vaf = {
|
|
.fmt = fmt,
|
|
.fmt = fmt,
|
|
@@ -261,7 +260,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
|
|
char nbuf[16];
|
|
char nbuf[16];
|
|
const char *errstr;
|
|
const char *errstr;
|
|
|
|
|
|
- errstr = btrfs_decode_error(root->fs_info, errno, nbuf);
|
|
|
|
|
|
+ errstr = btrfs_decode_error(errno, nbuf);
|
|
btrfs_printk(root->fs_info,
|
|
btrfs_printk(root->fs_info,
|
|
"%s:%d: Aborting unused transaction(%s).\n",
|
|
"%s:%d: Aborting unused transaction(%s).\n",
|
|
function, line, errstr);
|
|
function, line, errstr);
|
|
@@ -289,7 +288,7 @@ void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function,
|
|
va_start(args, fmt);
|
|
va_start(args, fmt);
|
|
vaf.va = &args;
|
|
vaf.va = &args;
|
|
|
|
|
|
- errstr = btrfs_decode_error(fs_info, errno, nbuf);
|
|
|
|
|
|
+ errstr = btrfs_decode_error(errno, nbuf);
|
|
if (fs_info->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR)
|
|
if (fs_info->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR)
|
|
panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (%s)\n",
|
|
panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (%s)\n",
|
|
s_id, function, line, &vaf, errstr);
|
|
s_id, function, line, &vaf, errstr);
|