diff options
| author | Heinz Mauelshagen <heinzm@redhat.com> | 2023-02-01 23:17:44 +0300 |
|---|---|---|
| committer | Mike Snitzer <snitzer@kernel.org> | 2023-02-14 22:23:06 +0300 |
| commit | d715fa23577cd5d36830c4ecd7e2bfcb4750b351 (patch) | |
| tree | 996c4ce089ec9338a118706c219d6866690731e3 /drivers/md/dm-writecache.c | |
| parent | 86a3238c7b9b759cb864f4f768ab2e24687dc0e6 (diff) | |
| download | linux-d715fa23577cd5d36830c4ecd7e2bfcb4750b351.tar.xz | |
dm: avoid assignment in if conditions
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Diffstat (limited to 'drivers/md/dm-writecache.c')
| -rw-r--r-- | drivers/md/dm-writecache.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index 17e064cde712..69aa708d6dae 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c @@ -1832,10 +1832,13 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba wb->wc = wc; bio->bi_end_io = writecache_writeback_endio; bio->bi_iter.bi_sector = read_original_sector(wc, e); - if (max_pages <= WB_LIST_INLINE || - unlikely(!(wb->wc_list = kmalloc_array(max_pages, sizeof(struct wc_entry *), - GFP_NOIO | __GFP_NORETRY | - __GFP_NOMEMALLOC | __GFP_NOWARN)))) { + + if (unlikely(max_pages > WB_LIST_INLINE)) + wb->wc_list = kmalloc_array(max_pages, sizeof(struct wc_entry *), + GFP_NOIO | __GFP_NORETRY | + __GFP_NOMEMALLOC | __GFP_NOWARN); + + if (likely(max_pages <= WB_LIST_INLINE) || unlikely(!wb->wc_list)) { wb->wc_list = wb->wc_list_inline; max_pages = WB_LIST_INLINE; } |