diff options
| author | Zhiqiang Liu <liuzhiqiang26@huawei.com> | 2019-12-07 11:00:08 +0800 |
|---|---|---|
| committer | Song Liu <songliubraving@fb.com> | 2020-01-13 11:44:09 -0800 |
| commit | 55180498dfd5f3c7e2d2c0e470f7cede1acee248 (patch) | |
| tree | c6f79ebea0d79129c5afa0a386908d0228461491 /drivers/md/md-bitmap.c | |
| parent | 8e42d239cb027143915cae13eb2ecf1360ee24de (diff) | |
| download | lwn-55180498dfd5f3c7e2d2c0e470f7cede1acee248.tar.gz lwn-55180498dfd5f3c7e2d2c0e470f7cede1acee248.zip | |
md-bitmap: small cleanups
In md_bitmap_unplug, bitmap->storage.filemap is double checked.
In md_bitmap_daemon_work, bitmap->storage.filemap should be checked
before reference.
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
Diffstat (limited to 'drivers/md/md-bitmap.c')
| -rw-r--r-- | drivers/md/md-bitmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c index 3ad18246fcb3..9860062bdc1e 100644 --- a/drivers/md/md-bitmap.c +++ b/drivers/md/md-bitmap.c @@ -1019,8 +1019,6 @@ void md_bitmap_unplug(struct bitmap *bitmap) /* look at each page to see if there are any set bits that need to be * flushed out to disk */ for (i = 0; i < bitmap->storage.file_pages; i++) { - if (!bitmap->storage.filemap) - return; dirty = test_and_clear_page_attr(bitmap, i, BITMAP_PAGE_DIRTY); need_write = test_and_clear_page_attr(bitmap, i, BITMAP_PAGE_NEEDWRITE); @@ -1338,7 +1336,8 @@ void md_bitmap_daemon_work(struct mddev *mddev) BITMAP_PAGE_DIRTY)) /* bitmap_unplug will handle the rest */ break; - if (test_and_clear_page_attr(bitmap, j, + if (bitmap->storage.filemap && + test_and_clear_page_attr(bitmap, j, BITMAP_PAGE_NEEDWRITE)) { write_page(bitmap, bitmap->storage.filemap[j], 0); } |