Btrfs: Include the device in most error printk()s

With more than one btrfs volume mounted, it can be very difficult to find
out which volume is hitting an error. btrfs_error() will print this, but
it is currently rigged as more of a fatal error handler, while many of
the printk()s are currently for debugging and yet-unhandled cases.

This patch just changes the functions where the device information is
already available. Some cases remain where the root or fs_info is not
passed to the function emitting the error.

This may introduce some confusion with volumes backed by multiple devices
emitting errors referring to the primary device in the set instead of the
one on which the error occurred.

Use btrfs_printk(fs_info, format, ...) rather than writing the device
string every time, and introduce macro wrappers ala XFS for brevity.
Since the function already cannot be used for continuations, print a
newline as part of the btrfs_printk() message rather than at each caller.

Signed-off-by: Simon Kirby <sim@hostway.ca>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 7f00a91ccc10..3fd4f2c3d529 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -105,7 +105,7 @@ static void btrfs_handle_error(struct btrfs_fs_info *fs_info)
 
         if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state)) {
                 sb->s_flags |= MS_RDONLY;
-                printk(KERN_INFO "btrfs is forced readonly\n");
+                btrfs_info(fs_info, "forced readonly");
                 /*
                  * Note that a running device replace operation is not
                  * canceled here although there is no way to update
@@ -172,7 +172,7 @@ static const char * const logtypes[] = {
         "debug",
 };
 
-void btrfs_printk(struct btrfs_fs_info *fs_info, const char *fmt, ...)
+void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
 {
         struct super_block *sb = fs_info->sb;
         char lvl[4];
@@ -196,7 +196,7 @@ void btrfs_printk(struct btrfs_fs_info *fs_info, const char *fmt, ...)
         vaf.fmt = fmt;
         vaf.va = &args;
 
-        printk("%sBTRFS %s (device %s): %pV", lvl, type, sb->s_id, &vaf);
+        printk("%sBTRFS %s (device %s): %pV\n", lvl, type, sb->s_id, &vaf);
 
         va_end(args);
 }
@@ -255,9 +255,9 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
                 const char *errstr;
 
                 errstr = btrfs_decode_error(errno);
-                btrfs_printk(root->fs_info,
-                             "%s:%d: Aborting unused transaction (%s)\n",
-                             function, line, errstr);
+                btrfs_warn(root->fs_info,
+                           "%s:%d: Aborting unused transaction(%s).",
+                           function, line, errstr);
                 return;
         }
         ACCESS_ONCE(trans->transaction->aborted) = errno;