mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 07:12:09 +00:00
md: change bitmap_unplug and others to void functions
bitmap_unplug only ever returns 0, so it may as well be void. Two callers try to print a message if it returns non-zero, but that message is already printed by bitmap_file_kick. write_page returns an error which is not consistently checked. It always causes BITMAP_WRITE_ERROR to be set on an error, and that can more conveniently be checked. When the return of write_page is checked, an error causes bitmap_file_kick to be called - so move that call into write_page - and protect against recursive calls into bitmap_file_kick. bitmap_update_sb returns an error that is never checked. So make these 'void' and be consistent about checking the bit. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
f0d76d70bc
commit
4ad1366376
5 changed files with 78 additions and 77 deletions
|
@ -1526,8 +1526,7 @@ static void raid1d(mddev_t *mddev)
|
|||
blk_remove_plug(mddev->queue);
|
||||
spin_unlock_irqrestore(&conf->device_lock, flags);
|
||||
/* flush any pending bitmap writes to disk before proceeding w/ I/O */
|
||||
if (bitmap_unplug(mddev->bitmap) != 0)
|
||||
printk("%s: bitmap file write failed!\n", mdname(mddev));
|
||||
bitmap_unplug(mddev->bitmap);
|
||||
|
||||
while (bio) { /* submit pending writes */
|
||||
struct bio *next = bio->bi_next;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue