Skip to content

Commit d436cfb

Browse files
committed
Merge branch 'for-7.1/block' into for-next
* for-7.1/block: blk-wbt: remove WARN_ON_ONCE from wbt_init_enable_default()
2 parents 09ebc43 + e9b004f commit d436cfb

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

block/blk-wbt.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -782,10 +782,11 @@ void wbt_init_enable_default(struct gendisk *disk)
782782
return;
783783

784784
rwb = wbt_alloc();
785-
if (WARN_ON_ONCE(!rwb))
785+
if (!rwb)
786786
return;
787787

788-
if (WARN_ON_ONCE(wbt_init(disk, rwb))) {
788+
if (wbt_init(disk, rwb)) {
789+
pr_warn("%s: failed to enable wbt\n", disk->disk_name);
789790
wbt_free(rwb);
790791
return;
791792
}

0 commit comments

Comments
 (0)