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

Commit 629ebf4f authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: record error if one block has failed to retry 



In the nocsum case of dio read endio, it returns immediately if an error
gets returned when repairing, which leaves the rest blocks unrepaired.  The
behavior is different from how buffered read endio works in the same case.
This changes it to record error only and go on repairing the rest blocks.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 17347cec

fs/btrfs/inode.c

+7 −3
Original line number Diff line number Diff line
@@ -8078,6 +8078,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode, 
	u32 sectorsize;

	int nr_sectors;

	int ret;

	int err = 0;



	fs_info = BTRFS_I(inode)->root->fs_info;

	sectorsize = fs_info->sectorsize;
@@ -8099,8 +8100,10 @@ static int __btrfs_correct_data_nocsum(struct inode *inode, 
				pgoff, start, start + sectorsize - 1,

				io_bio->mirror_num,

				btrfs_retry_endio_nocsum, &done);

		if (ret)

			return ret;

		if (ret) {

			err = ret;

			goto next;

		}



		wait_for_completion(&done.done);
@@ -8109,6 +8112,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode, 
			goto next_block_or_try_again;

		}



next:

		start += sectorsize;



		nr_sectors--;
@@ -8119,7 +8123,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode, 
		}

	}



	return 0;

	return err;

}



static void btrfs_retry_endio(struct bio *bio)