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

Commit 580c6efa authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: replace: cache rbio when rebuild data on missing device 



Rebuild on missing device is as same as recover, after it's done, rbio
has data which is consistent with on-disk data, so it can be cached to
avoid further reads.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarLiu Bo <bo.liu@linux.alibaba.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8a5a916d

fs/btrfs/raid56.c

+7 −3
Original line number Diff line number Diff line
@@ -1987,7 +1987,13 @@ static void __raid_recover_end_io(struct btrfs_raid_bio *rbio) 
	kfree(pointers);



cleanup_io:

	if (rbio->operation == BTRFS_RBIO_READ_REBUILD) {

	/*

	 * Similar to READ_REBUILD, REBUILD_MISSING at this point also has a

	 * valid rbio which is consistent with ondisk content, thus such a

	 * valid rbio can be cached to avoid further disk reads.

	 */

	if (rbio->operation == BTRFS_RBIO_READ_REBUILD ||

	    rbio->operation == BTRFS_RBIO_REBUILD_MISSING) {

		/*

		 * - In case of two failures, where rbio->failb != -1:

		 *
@@ -2008,8 +2014,6 @@ static void __raid_recover_end_io(struct btrfs_raid_bio *rbio) 
		else

			clear_bit(RBIO_CACHE_READY_BIT, &rbio->flags);



		rbio_orig_end_io(rbio, err);

	} else if (rbio->operation == BTRFS_RBIO_REBUILD_MISSING) {

		rbio_orig_end_io(rbio, err);

	} else if (err == BLK_STS_OK) {

		rbio->faila = -1;