Skip to content

Commit 59cefee

Browse files
Christoph Hellwigliu-song-6
authored andcommitted
md-bitmap: set BITMAP_WRITE_ERROR in write_sb_page
Set BITMAP_WRITE_ERROR directly in write_sb_page instead of propagating the error to the caller and setting it there. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Reviewed-by: Johannes Thumshirn <[email protected]> Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Song Liu <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f71209b commit 59cefee

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

drivers/md/md-bitmap.c

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -279,22 +279,20 @@ static int __write_sb_page(struct md_rdev *rdev, struct bitmap *bitmap,
279279
return 0;
280280
}
281281

282-
static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
282+
static void write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
283283
{
284-
struct md_rdev *rdev;
285284
struct mddev *mddev = bitmap->mddev;
286-
int ret;
287285

288286
do {
289-
rdev = NULL;
287+
struct md_rdev *rdev = NULL;
288+
290289
while ((rdev = next_active_rdev(rdev, mddev)) != NULL) {
291-
ret = __write_sb_page(rdev, bitmap, page);
292-
if (ret)
293-
return ret;
290+
if (__write_sb_page(rdev, bitmap, page) < 0) {
291+
set_bit(BITMAP_WRITE_ERROR, &bitmap->flags);
292+
return;
293+
}
294294
}
295295
} while (wait && md_super_wait(mddev) < 0);
296-
297-
return 0;
298296
}
299297

300298
static void md_bitmap_file_kick(struct bitmap *bitmap);
@@ -306,10 +304,7 @@ static void write_page(struct bitmap *bitmap, struct page *page, int wait)
306304
struct buffer_head *bh;
307305

308306
if (bitmap->storage.file == NULL) {
309-
switch (write_sb_page(bitmap, page, wait)) {
310-
case -EINVAL:
311-
set_bit(BITMAP_WRITE_ERROR, &bitmap->flags);
312-
}
307+
write_sb_page(bitmap, page, wait);
313308
} else {
314309

315310
bh = page_buffers(page);

0 commit comments

Comments
 (0)