Commit 640926ff authored by Chris Mason's avatar Chris Mason
Browse files

Merge branch 'cleanup/messages' of... 

Merge branch 'cleanup/messages' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4
parents 25cb62b7 f14d104d

fs/btrfs/check-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -845,8 +845,8 @@ static int btrfsic_process_superblock_dev_mirror( 
		superblock_tmp->never_written = 0;

		superblock_tmp->mirror_num = 1 + superblock_mirror_num;

		if (state->print_mask & BTRFSIC_PRINT_MASK_SUPERBLOCK_WRITE)

			printk_in_rcu(KERN_INFO "New initial S-block (bdev %p, %s)"

				     " @%llu (%s/%llu/%d)\n",

			btrfs_info_in_rcu(device->dev_root->fs_info,

				"new initial S-block (bdev %p, %s) @%llu (%s/%llu/%d)",

				     superblock_bdev,

				     rcu_str_deref(device->name), dev_bytenr,

				     dev_state->name, dev_bytenr,

fs/btrfs/ctree.h

+88 −0
Original line number Diff line number Diff line
@@ -4039,14 +4039,102 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...) 
#define btrfs_info(fs_info, fmt, args...) \

	btrfs_printk(fs_info, KERN_INFO fmt, ##args)



/*

 * Wrappers that use printk_in_rcu

 */

#define btrfs_emerg_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_in_rcu(fs_info, KERN_EMERG fmt, ##args)

#define btrfs_alert_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_in_rcu(fs_info, KERN_ALERT fmt, ##args)

#define btrfs_crit_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_in_rcu(fs_info, KERN_CRIT fmt, ##args)

#define btrfs_err_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_in_rcu(fs_info, KERN_ERR fmt, ##args)

#define btrfs_warn_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_in_rcu(fs_info, KERN_WARNING fmt, ##args)

#define btrfs_notice_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_in_rcu(fs_info, KERN_NOTICE fmt, ##args)

#define btrfs_info_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_in_rcu(fs_info, KERN_INFO fmt, ##args)



/*

 * Wrappers that use a ratelimited printk_in_rcu

 */

#define btrfs_emerg_rl_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_rl_in_rcu(fs_info, KERN_EMERG fmt, ##args)

#define btrfs_alert_rl_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_rl_in_rcu(fs_info, KERN_ALERT fmt, ##args)

#define btrfs_crit_rl_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_rl_in_rcu(fs_info, KERN_CRIT fmt, ##args)

#define btrfs_err_rl_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_rl_in_rcu(fs_info, KERN_ERR fmt, ##args)

#define btrfs_warn_rl_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_rl_in_rcu(fs_info, KERN_WARNING fmt, ##args)

#define btrfs_notice_rl_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_rl_in_rcu(fs_info, KERN_NOTICE fmt, ##args)

#define btrfs_info_rl_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_rl_in_rcu(fs_info, KERN_INFO fmt, ##args)



/*

 * Wrappers that use a ratelimited printk

 */

#define btrfs_emerg_rl(fs_info, fmt, args...) \

	btrfs_printk_ratelimited(fs_info, KERN_EMERG fmt, ##args)

#define btrfs_alert_rl(fs_info, fmt, args...) \

	btrfs_printk_ratelimited(fs_info, KERN_ALERT fmt, ##args)

#define btrfs_crit_rl(fs_info, fmt, args...) \

	btrfs_printk_ratelimited(fs_info, KERN_CRIT fmt, ##args)

#define btrfs_err_rl(fs_info, fmt, args...) \

	btrfs_printk_ratelimited(fs_info, KERN_ERR fmt, ##args)

#define btrfs_warn_rl(fs_info, fmt, args...) \

	btrfs_printk_ratelimited(fs_info, KERN_WARNING fmt, ##args)

#define btrfs_notice_rl(fs_info, fmt, args...) \

	btrfs_printk_ratelimited(fs_info, KERN_NOTICE fmt, ##args)

#define btrfs_info_rl(fs_info, fmt, args...) \

	btrfs_printk_ratelimited(fs_info, KERN_INFO fmt, ##args)

#ifdef DEBUG

#define btrfs_debug(fs_info, fmt, args...) \

	btrfs_printk(fs_info, KERN_DEBUG fmt, ##args)

#define btrfs_debug_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_in_rcu(fs_info, KERN_DEBUG fmt, ##args)

#define btrfs_debug_rl_in_rcu(fs_info, fmt, args...) \

	btrfs_printk_rl_in_rcu(fs_info, KERN_DEBUG fmt, ##args)

#define btrfs_debug_rl(fs_info, fmt, args...) \

	btrfs_printk_ratelimited(fs_info, KERN_DEBUG fmt, ##args)

#else

#define btrfs_debug(fs_info, fmt, args...) \

    no_printk(KERN_DEBUG fmt, ##args)

#define btrfs_debug_in_rcu(fs_info, fmt, args...) \

	no_printk(KERN_DEBUG fmt, ##args)

#define btrfs_debug_rl_in_rcu(fs_info, fmt, args...) \

	no_printk(KERN_DEBUG fmt, ##args)

#define btrfs_debug_rl(fs_info, fmt, args...) \

	no_printk(KERN_DEBUG fmt, ##args)

#endif



#define btrfs_printk_in_rcu(fs_info, fmt, args...)	\

do {							\

	rcu_read_lock();				\

	btrfs_printk(fs_info, fmt, ##args);		\

	rcu_read_unlock();				\

} while (0)



#define btrfs_printk_ratelimited(fs_info, fmt, args...)		\

do {								\

	static DEFINE_RATELIMIT_STATE(_rs,			\

		DEFAULT_RATELIMIT_INTERVAL,			\

		DEFAULT_RATELIMIT_BURST);       		\

	if (__ratelimit(&_rs))					\

		btrfs_printk(fs_info, fmt, ##args);		\

} while (0)



#define btrfs_printk_rl_in_rcu(fs_info, fmt, args...)		\

do {								\

	rcu_read_lock();					\

	btrfs_printk_ratelimited(fs_info, fmt, ##args);		\

	rcu_read_unlock();					\

} while (0)



#ifdef CONFIG_BTRFS_ASSERT



__cold

fs/btrfs/dev-replace.c

+8 −8
Original line number Diff line number Diff line
@@ -379,8 +379,8 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 
	if (ret)

		btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret);



	printk_in_rcu(KERN_INFO

		      "BTRFS: dev_replace from %s (devid %llu) to %s started\n",

	btrfs_info_in_rcu(root->fs_info,

		      "dev_replace from %s (devid %llu) to %s started",

		      src_device->missing ? "<missing disk>" :

		        rcu_str_deref(src_device->name),

		      src_device->devid,
@@ -523,8 +523,8 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
								src_device,

								tgt_device);

	} else {

		printk_in_rcu(KERN_ERR

			      "BTRFS: btrfs_scrub_dev(%s, %llu, %s) failed %d\n",

		btrfs_err_in_rcu(root->fs_info,

			      "btrfs_scrub_dev(%s, %llu, %s) failed %d",

			      src_device->missing ? "<missing disk>" :

			        rcu_str_deref(src_device->name),

			      src_device->devid,
@@ -540,8 +540,8 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
		return scrub_ret;

	}



	printk_in_rcu(KERN_INFO

		      "BTRFS: dev_replace from %s (devid %llu) to %s finished\n",

	btrfs_info_in_rcu(root->fs_info,

		      "dev_replace from %s (devid %llu) to %s finished",

		      src_device->missing ? "<missing disk>" :

		        rcu_str_deref(src_device->name),

		      src_device->devid,
@@ -809,8 +809,8 @@ static int btrfs_dev_replace_kthread(void *data) 
		progress = status_args->status.progress_1000;

		kfree(status_args);

		progress = div_u64(progress, 10);

		printk_in_rcu(KERN_INFO

			"BTRFS: continuing dev_replace from %s (devid %llu) to %s @%u%%\n",

		btrfs_info_in_rcu(fs_info,

			"continuing dev_replace from %s (devid %llu) to %s @%u%%",

			dev_replace->srcdev->missing ? "<missing disk>" :

			rcu_str_deref(dev_replace->srcdev->name),

			dev_replace->srcdev->devid,

fs/btrfs/disk-io.c

+18 −19
Original line number Diff line number Diff line
@@ -319,9 +319,9 @@ static int csum_tree_block(struct btrfs_fs_info *fs_info, 
			memcpy(&found, result, csum_size);



			read_extent_buffer(buf, &val, 0, csum_size);

			printk_ratelimited(KERN_WARNING

				"BTRFS: %s checksum verify failed on %llu wanted %X found %X "

				"level %d\n",

			btrfs_warn_rl(fs_info,

				"%s checksum verify failed on %llu wanted %X found %X "

				"level %d",

				fs_info->sb->s_id, buf->start,

				val, found, btrfs_header_level(buf));

			if (result != (char *)&inline_result)
@@ -368,9 +368,9 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, 
		ret = 0;

		goto out;

	}

	printk_ratelimited(KERN_ERR

	    "BTRFS (device %s): parent transid verify failed on %llu wanted %llu found %llu\n",

			eb->fs_info->sb->s_id, eb->start,

	btrfs_err_rl(eb->fs_info,

		"parent transid verify failed on %llu wanted %llu found %llu",

			eb->start,

			parent_transid, btrfs_header_generation(eb));

	ret = 1;
@@ -629,15 +629,14 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, 


	found_start = btrfs_header_bytenr(eb);

	if (found_start != eb->start) {

		printk_ratelimited(KERN_ERR "BTRFS (device %s): bad tree block start "

			       "%llu %llu\n",

			       eb->fs_info->sb->s_id, found_start, eb->start);

		btrfs_err_rl(eb->fs_info, "bad tree block start %llu %llu",

			       found_start, eb->start);

		ret = -EIO;

		goto err;

	}

	if (check_tree_block_fsid(root->fs_info, eb)) {

		printk_ratelimited(KERN_ERR "BTRFS (device %s): bad fsid on block %llu\n",

			       eb->fs_info->sb->s_id, eb->start);

		btrfs_err_rl(eb->fs_info, "bad fsid on block %llu",

			       eb->start);

		ret = -EIO;

		goto err;

	}
@@ -2348,8 +2347,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info, 
	u64 bytenr = btrfs_super_log_root(disk_super);



	if (fs_devices->rw_devices == 0) {

		printk(KERN_WARNING "BTRFS: log replay required "

		       "on RO media\n");

		btrfs_warn(fs_info, "log replay required on RO media");

		return -EIO;

	}
@@ -2364,12 +2362,12 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info, 
	log_tree_root->node = read_tree_block(tree_root, bytenr,

			fs_info->generation + 1);

	if (IS_ERR(log_tree_root->node)) {

		printk(KERN_ERR "BTRFS: failed to read log tree\n");

		btrfs_warn(fs_info, "failed to read log tree");

		ret = PTR_ERR(log_tree_root->node);

		kfree(log_tree_root);

		return ret;

	} else if (!extent_buffer_uptodate(log_tree_root->node)) {

		printk(KERN_ERR "BTRFS: failed to read log tree\n");

		btrfs_err(fs_info, "failed to read log tree");

		free_extent_buffer(log_tree_root->node);

		kfree(log_tree_root);

		return -EIO;
@@ -3179,8 +3177,8 @@ static void btrfs_end_buffer_write_sync(struct buffer_head *bh, int uptodate) 
		struct btrfs_device *device = (struct btrfs_device *)

			bh->b_private;



		printk_ratelimited_in_rcu(KERN_WARNING "BTRFS: lost page write due to "

					  "I/O error on %s\n",

		btrfs_warn_rl_in_rcu(device->dev_root->fs_info,

				"lost page write due to IO error on %s",

					  rcu_str_deref(device->name));

		/* note, we dont' set_buffer_write_io_error because we have

		 * our own ways of dealing with the IO errors
@@ -3299,8 +3297,9 @@ static int write_dev_supers(struct btrfs_device *device, 
			bh = __getblk(device->bdev, bytenr / 4096,

				      BTRFS_SUPER_INFO_SIZE);

			if (!bh) {

				printk(KERN_ERR "BTRFS: couldn't get super "

				       "buffer head for bytenr %Lu\n", bytenr);

				btrfs_err(device->dev_root->fs_info,

				    "couldn't get super buffer head for bytenr %llu",

				    bytenr);

				errors++;

				continue;

			}

fs/btrfs/extent-tree.c

+8 −6
Original line number Diff line number Diff line
@@ -8275,10 +8275,11 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 
			ret = account_shared_subtree(trans, root, next,

						     generation, level - 1);

			if (ret) {

				printk_ratelimited(KERN_ERR "BTRFS: %s Error "

				btrfs_err_rl(root->fs_info,

					"Error "

					"%d accounting shared subtree. Quota "

					"is out of sync, rescan required.\n",

					root->fs_info->sb->s_id, ret);

					"is out of sync, rescan required.",

					ret);

			}

		}

		ret = btrfs_free_extent(trans, root, bytenr, blocksize, parent,
@@ -8367,10 +8368,11 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans, 
			BUG_ON(ret); /* -ENOMEM */

			ret = account_leaf_items(trans, root, eb);

			if (ret) {

				printk_ratelimited(KERN_ERR "BTRFS: %s Error "

				btrfs_err_rl(root->fs_info,

					"error "

					"%d accounting leaf items. Quota "

					"is out of sync, rescan required.\n",

					root->fs_info->sb->s_id, ret);

					"is out of sync, rescan required.",

					ret);

			}

		}

		/* make block locked assertion in clean_tree_block happy */