Merge tag 'kspp-misc-fixes-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-kernels.git] / fs / fs-writeback.c

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 4124a89a1a5df55097550704b1288cc453cd8749..67f0e88eed01ae3035d7593f21057ccfc47db856 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -566,7 +566,7 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)
        if (atomic_read(&isw_nr_in_flight) > WB_FRN_MAX_IN_FLIGHT)
                return;
 
-       isw = kzalloc(sizeof(*isw) + 2 * sizeof(struct inode *), GFP_ATOMIC);
+       isw = kzalloc(struct_size(isw, inodes, 2), GFP_ATOMIC);
        if (!isw)
                return;
 
@@ -624,8 +624,8 @@ bool cleanup_offline_cgwb(struct bdi_writeback *wb)
        int nr;
        bool restart = false;
 
-       isw = kzalloc(sizeof(*isw) + WB_MAX_INODES_PER_ISW *
-                     sizeof(struct inode *), GFP_KERNEL);
+       isw = kzalloc(struct_size(isw, inodes, WB_MAX_INODES_PER_ISW),
+                     GFP_KERNEL);
        if (!isw)
                return restart;