diff options
author | Eric Sandeen <sandeen@redhat.com> | 2013-01-30 19:54:54 -0500 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2013-02-20 12:59:17 -0500 |
commit | 5a01604783c23f28bd4212e839e79277193f974f (patch) | |
tree | b6466b6b2d30dbb96147416fbed8cb21ebb71605 /fs/btrfs/super.c | |
parent | d1d3cd27a32b819a0b0e2b9b6b5f9e80890f9821 (diff) |
btrfs: remove unused fs_info from btrfs_decode_error()
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r-- | fs/btrfs/super.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 4152f9ea34f5..fd6a07c30ee9 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -63,8 +63,7 @@ | |||
63 | static const struct super_operations btrfs_super_ops; | 63 | static const struct super_operations btrfs_super_ops; |
64 | static struct file_system_type btrfs_fs_type; | 64 | static struct file_system_type btrfs_fs_type; |
65 | 65 | ||
66 | static const char *btrfs_decode_error(struct btrfs_fs_info *fs_info, int errno, | 66 | static const char *btrfs_decode_error(int errno, char nbuf[16]) |
67 | char nbuf[16]) | ||
68 | { | 67 | { |
69 | char *errstr = NULL; | 68 | char *errstr = NULL; |
70 | 69 | ||
@@ -152,7 +151,7 @@ void __btrfs_std_error(struct btrfs_fs_info *fs_info, const char *function, | |||
152 | if (errno == -EROFS && (sb->s_flags & MS_RDONLY)) | 151 | if (errno == -EROFS && (sb->s_flags & MS_RDONLY)) |
153 | return; | 152 | return; |
154 | 153 | ||
155 | errstr = btrfs_decode_error(fs_info, errno, nbuf); | 154 | errstr = btrfs_decode_error(errno, nbuf); |
156 | if (fmt) { | 155 | if (fmt) { |
157 | struct va_format vaf = { | 156 | struct va_format vaf = { |
158 | .fmt = fmt, | 157 | .fmt = fmt, |
@@ -261,7 +260,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, | |||
261 | char nbuf[16]; | 260 | char nbuf[16]; |
262 | const char *errstr; | 261 | const char *errstr; |
263 | 262 | ||
264 | errstr = btrfs_decode_error(root->fs_info, errno, nbuf); | 263 | errstr = btrfs_decode_error(errno, nbuf); |
265 | btrfs_printk(root->fs_info, | 264 | btrfs_printk(root->fs_info, |
266 | "%s:%d: Aborting unused transaction(%s).\n", | 265 | "%s:%d: Aborting unused transaction(%s).\n", |
267 | function, line, errstr); | 266 | function, line, errstr); |
@@ -289,7 +288,7 @@ void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function, | |||
289 | va_start(args, fmt); | 288 | va_start(args, fmt); |
290 | vaf.va = &args; | 289 | vaf.va = &args; |
291 | 290 | ||
292 | errstr = btrfs_decode_error(fs_info, errno, nbuf); | 291 | errstr = btrfs_decode_error(errno, nbuf); |
293 | if (fs_info->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR) | 292 | if (fs_info->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR) |
294 | panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (%s)\n", | 293 | panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (%s)\n", |
295 | s_id, function, line, &vaf, errstr); | 294 | s_id, function, line, &vaf, errstr); |