From 3353413c4084fe190413fedd4f41c975a9006654 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 31 Jan 2013 00:54:54 +0000 Subject: [PATCH] --- yaml --- r: 360423 b: refs/heads/master c: 5a01604783c23f28bd4212e839e79277193f974f h: refs/heads/master i: 360421: 796fc6964d474dda59b56a7470a47b0f7bf6ce6f 360419: 1aaa80b1e56ee19d760c72bfa656ab2df4958f2c 360415: 214ebbc9f017f6fc542563e34fb933e2882c9805 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/super.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a1c465b71dfc..d90b660dc126 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1d3cd27a32b819a0b0e2b9b6b5f9e80890f9821 +refs/heads/master: 5a01604783c23f28bd4212e839e79277193f974f diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c index 4152f9ea34f5..fd6a07c30ee9 100644 --- a/trunk/fs/btrfs/super.c +++ b/trunk/fs/btrfs/super.c @@ -63,8 +63,7 @@ static const struct super_operations btrfs_super_ops; 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; @@ -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)) return; - errstr = btrfs_decode_error(fs_info, errno, nbuf); + errstr = btrfs_decode_error(errno, nbuf); if (fmt) { struct va_format vaf = { .fmt = fmt, @@ -261,7 +260,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, char nbuf[16]; const char *errstr; - errstr = btrfs_decode_error(root->fs_info, errno, nbuf); + errstr = btrfs_decode_error(errno, nbuf); btrfs_printk(root->fs_info, "%s:%d: Aborting unused transaction(%s).\n", function, line, errstr); @@ -289,7 +288,7 @@ void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function, va_start(args, fmt); 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) panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (%s)\n", s_id, function, line, &vaf, errstr);