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

Commit f2f66a2f authored by Zhao Lei's avatar Zhao Lei Committed by Chris Mason
Browse files

btrfs: Check cancel and pause in interval of scrub operation 



Old code checking cancel and pause request inside scrub stripe
operation, like:
  loop() {
    if (parity) {
      scrub_parity_stripe();
      continue;
    }

    check_cancel_and_pause()

    scrub_normal_stripe();
  }

Reason is when introduce raid56 stripe scrub, new code is inserted
simplely to front of loop.

Better to:
  loop() {
    check_cancel_and_pause()

    if (parity)
      scrub_parity_stripe();
    else
      scrub_normal_stripe();
  }

This patch adjusted code place to realize above sequence.

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 78fa1770

fs/btrfs/scrub.c

+18 −16
Original line number Original line Diff line number Diff line
@@ -3105,22 +3105,6 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx, 
	 */

	 */

	ret = 0;

	ret = 0;

	while (physical < physical_end) {

	while (physical < physical_end) {

		/* for raid56, we skip parity stripe */

		if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK) {

			ret = get_raid56_logic_offset(physical, num,

					map, &logical, &stripe_logical);

			logical += base;

			if (ret) {

				stripe_logical += base;

				stripe_end = stripe_logical + increment - 1;

				ret = scrub_raid56_parity(sctx, map, scrub_dev,

						ppath, stripe_logical,

						stripe_end);

				if (ret)

					goto out;

				goto skip;

			}

		}

		/*

		/*

		 * canceled?

		 * canceled?

		 */

		 */
@@ -3145,6 +3129,24 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx, 
			scrub_blocked_if_needed(fs_info);

			scrub_blocked_if_needed(fs_info);

		}

		}





		/* for raid56, we skip parity stripe */

		if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK) {

			ret = get_raid56_logic_offset(physical, num, map,

						      &logical,

						      &stripe_logical);

			logical += base;

			if (ret) {

				stripe_logical += base;

				stripe_end = stripe_logical + increment - 1;

				ret = scrub_raid56_parity(sctx, map, scrub_dev,

							  ppath, stripe_logical,

							  stripe_end);

				if (ret)

					goto out;

				goto skip;

			}

		}



		if (btrfs_fs_incompat(fs_info, SKINNY_METADATA))

		if (btrfs_fs_incompat(fs_info, SKINNY_METADATA))

			key.type = BTRFS_METADATA_ITEM_KEY;

			key.type = BTRFS_METADATA_ITEM_KEY;

		else

		else