The patch titled Subject: mm/z3fold: define macro NCHUNKS as TOTAL_CHUNKS - ZHDR_CHUNKS has been added to the -mm tree. Its filename is mm-z3fold-define-macro-nchunks-as-total_chunks-zhdr_chunks.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-z3fold-define-macro-nchunks-as-total_chunks-zhdr_chunks.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-z3fold-define-macro-nchunks-as-total_chunks-zhdr_chunks.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin <linmiaohe@xxxxxxxxxx> Subject: mm/z3fold: define macro NCHUNKS as TOTAL_CHUNKS - ZHDR_CHUNKS Patch series "Cleanup and fixup for z3fold". This series contains cleanups to remove unused function, redefine macro to improve readability and so on. Also this fixes several bugs in z3fold, such as memory leak in z3fold_destroy_pool(). More details can be found in the respective changelogs. This patch (of 6): To improve code readability, we could define macro NCHUNKS as TOTAL_CHUNKS - ZHDR_CHUNKS. No functional change intended. Link: https://lkml.kernel.org/r/20210619093151.1492174-1-linmiaohe@xxxxxxxxxx Link: https://lkml.kernel.org/r/20210619093151.1492174-2-linmiaohe@xxxxxxxxxx Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx> Reviewed-by: Vitaly Wool <vitaly.wool@xxxxxxxxxxxx> Cc: Hillf Danton <hdanton@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/z3fold.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/z3fold.c~mm-z3fold-define-macro-nchunks-as-total_chunks-zhdr_chunks +++ a/mm/z3fold.c @@ -62,7 +62,7 @@ #define ZHDR_SIZE_ALIGNED round_up(sizeof(struct z3fold_header), CHUNK_SIZE) #define ZHDR_CHUNKS (ZHDR_SIZE_ALIGNED >> CHUNK_SHIFT) #define TOTAL_CHUNKS (PAGE_SIZE >> CHUNK_SHIFT) -#define NCHUNKS ((PAGE_SIZE - ZHDR_SIZE_ALIGNED) >> CHUNK_SHIFT) +#define NCHUNKS (TOTAL_CHUNKS - ZHDR_CHUNKS) #define BUDDY_MASK (0x3) #define BUDDY_SHIFT 2 _ Patches currently in -mm which might be from linmiaohe@xxxxxxxxxx are mm-swapfile-use-percpu_ref-to-serialize-against-concurrent-swapoff.patch swap-fix-do_swap_page-race-with-swapoff.patch mm-swap-remove-confusing-checking-for-non_swap_entry-in-swap_ra_info.patch mm-shmem-fix-shmem_swapin-race-with-swapoff.patch mm-swapfile-move-get_swap_page_of_type-under-config_hibernation.patch mm-swapfile-move-get_swap_page_of_type-under-config_hibernation-fix.patch mm-swapfile-move-get_swap_page_of_type-under-config_hibernation-fix-2.patch mm-swap-remove-unused-local-variable-nr_shadows.patch mm-swap_slotsc-delete-meaningless-forward-declarations.patch mm-huge_memoryc-remove-dedicated-macro-hpage_cache_index_mask.patch mm-huge_memoryc-use-page-deferred_list.patch mm-huge_memoryc-add-missing-read-only-thp-checking-in-transparent_hugepage_enabled.patch mm-huge_memoryc-add-missing-read-only-thp-checking-in-transparent_hugepage_enabled-v4.patch mm-huge_memoryc-remove-unnecessary-tlb_remove_page_size-for-huge-zero-pmd.patch mm-huge_memoryc-dont-discard-hugepage-if-other-processes-are-mapping-it.patch mm-z3fold-define-macro-nchunks-as-total_chunks-zhdr_chunks.patch mm-z3fold-avoid-possible-underflow-in-z3fold_alloc.patch mm-z3fold-remove-magic-number-in-z3fold_create_pool.patch mm-z3fold-remove-unused-function-handle_to_z3fold_header.patch mm-z3fold-fix-potential-memory-leak-in-z3fold_destroy_pool.patch mm-z3fold-use-release_z3fold_page_locked-to-release-locked-z3fold-page.patch mm-zbud-reuse-unbuddied-as-buddied-in-zbud_pool.patch mm-zbud-dont-export-any-zbud-api.patch mm-zswapc-remove-unused-function-zswap_debugfs_exit.patch mm-zswapc-avoid-unnecessary-copy-in-at-map-time.patch mm-zswapc-fix-two-bugs-in-zswap_writeback_entry.patch