diff options
| author | Jens Axboe <[email protected]> | 2021-11-02 13:11:56 -0600 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2021-11-02 13:11:56 -0600 |
| commit | 579b517474003e2d8bbb3e54d687c58091c72c85 (patch) | |
| tree | 1d8f107b9eba94ce7153130d508736fbf8e55553 | |
| parent | e2daec488c57069a4a431d5b752f50294c4bf273 (diff) | |
| parent | 1e37799b50eccb79c59c660b330746a7848c346b (diff) | |
Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.16/drivers
Pull MD updates from Song:
"The only significant change here is a fix in back_log sysfs entry, by
Guoqing Jiang."
* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
raid5-ppl: use swap() to make code cleaner
md/bitmap: don't set max_write_behind if there is no write mostly device
| -rw-r--r-- | drivers/md/md-bitmap.c | 19 | ||||
| -rw-r--r-- | drivers/md/raid5-ppl.c | 6 |
2 files changed, 21 insertions, 4 deletions
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c index e29c6298ef5c..bfd6026d7809 100644 --- a/drivers/md/md-bitmap.c +++ b/drivers/md/md-bitmap.c @@ -2469,11 +2469,30 @@ backlog_store(struct mddev *mddev, const char *buf, size_t len) { unsigned long backlog; unsigned long old_mwb = mddev->bitmap_info.max_write_behind; + struct md_rdev *rdev; + bool has_write_mostly = false; int rv = kstrtoul(buf, 10, &backlog); if (rv) return rv; if (backlog > COUNTER_MAX) return -EINVAL; + + /* + * Without write mostly device, it doesn't make sense to set + * backlog for max_write_behind. + */ + rdev_for_each(rdev, mddev) { + if (test_bit(WriteMostly, &rdev->flags)) { + has_write_mostly = true; + break; + } + } + if (!has_write_mostly) { + pr_warn_ratelimited("%s: can't set backlog, no write mostly device available\n", + mdname(mddev)); + return -EINVAL; + } + mddev->bitmap_info.max_write_behind = backlog; if (!backlog && mddev->serial_info_pool) { /* serial_info_pool is not needed if backlog is zero */ diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c index 3ddc2aa0b530..4ab417915d7f 100644 --- a/drivers/md/raid5-ppl.c +++ b/drivers/md/raid5-ppl.c @@ -1081,7 +1081,7 @@ static int ppl_load_distributed(struct ppl_log *log) struct ppl_conf *ppl_conf = log->ppl_conf; struct md_rdev *rdev = log->rdev; struct mddev *mddev = rdev->mddev; - struct page *page, *page2, *tmp; + struct page *page, *page2; struct ppl_header *pplhdr = NULL, *prev_pplhdr = NULL; u32 crc, crc_stored; u32 signature; @@ -1156,9 +1156,7 @@ static int ppl_load_distributed(struct ppl_log *log) prev_pplhdr_offset = pplhdr_offset; prev_pplhdr = pplhdr; - tmp = page; - page = page2; - page2 = tmp; + swap(page, page2); /* calculate next potential ppl offset */ for (i = 0; i < le32_to_cpu(pplhdr->entries_count); i++) |