Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48940662 authored by Daniel J Blueman's avatar Daniel J Blueman Committed by Chris Mason
Browse files

btrfs: fix message printing 



Fix various messages to include newline and module prefix.

Signed-off-by: default avatarDaniel J Blueman <daniel@quora.org>
parent 94edf4ae

fs/btrfs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans, 
			       struct btrfs_root *root, const char *function,

			       unsigned int line, int errno)

{

	WARN_ONCE(1, KERN_DEBUG "btrfs: Transaction aborted");

	WARN_ONCE(1, KERN_DEBUG "btrfs: Transaction aborted\n");

	trans->aborted = errno;

	/* Nothing used. The other threads that have joined this

	 * transaction may be able to continue. */
@@ -549,11 +549,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
			btrfs_set_opt(info->mount_opt, ENOSPC_DEBUG);

			break;

		case Opt_defrag:

			printk(KERN_INFO "btrfs: enabling auto defrag");

			printk(KERN_INFO "btrfs: enabling auto defrag\n");

			btrfs_set_opt(info->mount_opt, AUTO_DEFRAG);

			break;

		case Opt_recovery:

			printk(KERN_INFO "btrfs: enabling auto recovery");

			printk(KERN_INFO "btrfs: enabling auto recovery\n");

			btrfs_set_opt(info->mount_opt, RECOVERY);

			break;

		case Opt_skip_balance:
@@ -1602,7 +1602,7 @@ static int btrfs_interface_init(void) 
static void btrfs_interface_exit(void)

{

	if (misc_deregister(&btrfs_misc) < 0)

		printk(KERN_INFO "misc_deregister failed for control device");

		printk(KERN_INFO "btrfs: misc_deregister failed for control device\n");

}



static int __init init_btrfs_fs(void)

fs/btrfs/volumes.c

+3 −3
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, 


		bdev = blkdev_get_by_path(device->name->str, flags, holder);

		if (IS_ERR(bdev)) {

			printk(KERN_INFO "open %s failed\n", device->name->str);

			printk(KERN_INFO "btrfs: open %s failed\n", device->name->str);

			goto error;

		}

		filemap_write_and_wait(bdev->bd_inode->i_mapping);
@@ -3769,7 +3769,7 @@ static int __btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw, 
	read_unlock(&em_tree->lock);



	if (!em) {

		printk(KERN_CRIT "unable to find logical %llu len %llu\n",

		printk(KERN_CRIT "btrfs: unable to find logical %llu len %llu\n",

		       (unsigned long long)logical,

		       (unsigned long long)*length);

		BUG();
@@ -4226,7 +4226,7 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio, 


	total_devs = bbio->num_stripes;

	if (map_length < length) {

		printk(KERN_CRIT "mapping failed logical %llu bio len %llu "

		printk(KERN_CRIT "btrfs: mapping failed logical %llu bio len %llu "

		       "len %llu\n", (unsigned long long)logical,

		       (unsigned long long)length,

		       (unsigned long long)map_length);

fs/btrfs/zlib.c

+4 −4
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int zlib_compress_pages(struct list_head *ws, 
	*total_in = 0;



	if (Z_OK != zlib_deflateInit(&workspace->def_strm, 3)) {

		printk(KERN_WARNING "deflateInit failed\n");

		printk(KERN_WARNING "btrfs: deflateInit failed\n");

		ret = -1;

		goto out;

	}
@@ -125,7 +125,7 @@ static int zlib_compress_pages(struct list_head *ws, 
	while (workspace->def_strm.total_in < len) {

		ret = zlib_deflate(&workspace->def_strm, Z_SYNC_FLUSH);

		if (ret != Z_OK) {

			printk(KERN_DEBUG "btrfs deflate in loop returned %d\n",

			printk(KERN_DEBUG "btrfs: deflate in loop returned %d\n",

			       ret);

			zlib_deflateEnd(&workspace->def_strm);

			ret = -1;
@@ -252,7 +252,7 @@ static int zlib_decompress_biovec(struct list_head *ws, struct page **pages_in, 
	}



	if (Z_OK != zlib_inflateInit2(&workspace->inf_strm, wbits)) {

		printk(KERN_WARNING "inflateInit failed\n");

		printk(KERN_WARNING "btrfs: inflateInit failed\n");

		return -1;

	}

	while (workspace->inf_strm.total_in < srclen) {
@@ -336,7 +336,7 @@ static int zlib_decompress(struct list_head *ws, unsigned char *data_in, 
	}



	if (Z_OK != zlib_inflateInit2(&workspace->inf_strm, wbits)) {

		printk(KERN_WARNING "inflateInit failed\n");

		printk(KERN_WARNING "btrfs: inflateInit failed\n");

		return -1;

	}