Skip to content

Commit

Permalink
md: don't require sync_min to be a multiple of chunk_size.
Browse files Browse the repository at this point in the history
There is really no need for sync_min to be a multiple of
chunk_size, and values read from here often aren't.
That means you cannot read a value and expect to be able
to write it back later.

So remove the chunk_size check, and round down to a multiple
of 4K, to be sure everything works with 4K-sector devices.

Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
NeilBrown committed Apr 21, 2015
1 parent d51e4fe commit 50c37b1
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -4427,7 +4427,6 @@ min_sync_store(struct mddev *mddev, const char *buf, size_t len)
{
unsigned long long min;
int err;
int chunk;

if (kstrtoull(buf, 10, &min))
return -EINVAL;
Expand All @@ -4441,16 +4440,8 @@ min_sync_store(struct mddev *mddev, const char *buf, size_t len)
if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
goto out_unlock;

/* Must be a multiple of chunk_size */
chunk = mddev->chunk_sectors;
if (chunk) {
sector_t temp = min;

err = -EINVAL;
if (sector_div(temp, chunk))
goto out_unlock;
}
mddev->resync_min = min;
/* Round down to multiple of 4K for safety */
mddev->resync_min = round_down(min, 8);
err = 0;

out_unlock:
Expand Down

0 comments on commit 50c37b1

Please sign in to comment.