Commit 2e49f51a authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-next' of... 

Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.9/drivers

Pull MD fix from Song.

* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid5: use do_div() for 64 bit divisions in raid5_sync_request
parents ef67744e 83c3e5e1

drivers/md/raid5.c

+1 −1
Original line number Diff line number Diff line
@@ -6104,7 +6104,7 @@ static inline sector_t raid5_sync_request(struct mddev *mddev, sector_t sector_n 
	    !md_bitmap_start_sync(mddev->bitmap, sector_nr, &sync_blocks, 1) &&

	    sync_blocks >= RAID5_STRIPE_SECTORS(conf)) {

		/* we can skip this block, and probably more */

		sync_blocks /= RAID5_STRIPE_SECTORS(conf);

		do_div(sync_blocks, RAID5_STRIPE_SECTORS(conf));

		*skipped = 1;

		/* keep things rounded to whole stripes */

		return sync_blocks * RAID5_STRIPE_SECTORS(conf);