The patch titled reiser4: kmalloc + memset conversion to kzalloc has been added to the -mm tree. Its filename is kmalloc-memset-conversion-to-kzalloc.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: reiser4: kmalloc + memset conversion to kzalloc From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx> Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx> Cc: Edward Shishkin <edward@xxxxxxxxxxx> Cc: "Vladimir V. Saveliev" <vs@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiser4/plugin/file/cryptcompress.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff -puN fs/reiser4/plugin/file/cryptcompress.h~kmalloc-memset-conversion-to-kzalloc fs/reiser4/plugin/file/cryptcompress.h --- a/fs/reiser4/plugin/file/cryptcompress.h~kmalloc-memset-conversion-to-kzalloc +++ a/fs/reiser4/plugin/file/cryptcompress.h @@ -86,10 +86,9 @@ static inline int alloc_ts(struct tfm_st assert("edward-931", stm); assert("edward-932", *stm == NULL); - *stm = kmalloc(sizeof **stm, reiser4_ctx_gfp_mask_get()); - if (*stm == NULL) + *stm = kzalloc(sizeof(**stm), reiser4_ctx_gfp_mask_get()); + if (!*stm) return -ENOMEM; - memset(*stm, 0, sizeof **stm); return 0; } _ Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are fs-9p-convc-error-path-fix.patch mtd-add-module-license-to-mtdbdi.patch mtd-remove-redundant-dead-code-from-physmap_ofc.patch usb-remove-redundant-memset-from-amd5536udc.patch dont-optimise-away-baud-rate-changes-when-bother-is-used.patch kmalloc-memset-conversion-co-kzalloc.patch drivers-sbus-char-bbc_envctrlc-kmalloc-memset-conversion-to-kzalloc.patch drivers-sbus-char-bbc_i2cc-kmalloc-memset-conversion-to-kzalloc.patch drivers-mmc-core-busc-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-bvme6000_scsic-kmalloc-memset-conversion-to-kzalloc.patch drivers-block-ccissc-kmalloc-memset-conversion-to-kzalloc.patch fs-cifs-connectc-kmalloc-memset-conversion-to-kzalloc.patch drivers-char-consolemapc-kmalloc-memset-conversion-to-kzalloc.patch drivers-block-cpqarrayc-better-error-handling-and-kmalloc-memset-conversion-to-kalloc.patch drivers-pci-hotplug-cpqphp_ctrlc-kmalloc-memset-conversion-to-kzalloc.patch fs-reiser4-plugin-file-cryptcompressc-kmalloc-memset-conversion-to-kzalloc.patch kmalloc-memset-conversion-to-kzalloc.patch drivers-md-dm-hw-handlerc-kmalloc-memset-conversion-to-kzalloc.patch drivers-md-dm-path-selectorc-kmalloc-memset-conversion-to-kzalloc.patch drivers-md-dm-tablec-kmalloc-memset-conversion-to-kzalloc.patch drivers-md-dm-targetc-kmalloc-memset-conversion-to-kzalloc.patch net-decnet-dn_routec-kmalloc-memset-conversion-to-kzalloc.patch doc-firmware_sample_firmware_classc-kmalloc-memset-conversion-to-kzalloc.patch include-asm-frv-thread_infoh-kmalloc-memset-conversion-to-kzalloc.patch drivers-usb-misc-ftdi-elanc-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-gdthc-kmalloc-memset-conversion-to-kzalloc.patch drivers-input-serio-gscps2c-kmalloc-memset-conversion-to-kzalloc.patch drivers-net-wan-hdlc_frc-kmalloc-memset-conversion-to-kzalloc.patch drivers-mmc-core-hostc-kmalloc-memset-conversion-to-kzalloc.patch drivers-ide-arm-icsidec-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-ide-scsic-kmalloc-memset-conversion-to-kzalloc.patch fs-reiser4-init_superc-kmalloc-memset-conversion-to-kzalloc.patch fs-autofs4-inodec-kmalloc-memset-conversion-to-kzalloc.patch fs-reiser4-plugin-inode_ops_renamec-kmalloc-memset-conversion-to-kzalloc.patch arch-x86_64-kernel-io_apicc-kmalloc-memset-conversion-to-kzalloc.patch drivers-char-ip2-ip2mainc-kmalloc-memset-conversion-to-kzalloc.patch net-ipv4-ip_optionsc-kmalloc-memset-conversion-to-kzalloc.patch drivers-atm-iphasec-mostly-kmalloc-memset-conversion-to-kzalloc.patch drivers-net-irda-irda-usbc-mostly-kmalloc-memset-conversion-to-kalloc.patch fs-jbd2-journalc-kmalloc-memset-conversion-to-kzalloc.patch fs-reiser4-ktxnmgrdc-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-lpfc-lpfc_debugfsc-kmalloc-memset-conversion-to-kcalloc.patch drivers-scsi-lpfc-lpfc_initc-kmalloc-memset-conversion-to-kcalloc.patch drivers-scsi-lpfc-lpfc_scsic-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-megaraidc-kmalloc-memset-conversion-to-kzalloc.patch drivers-mmc-core-mmc_opsc-kmalloc-memset-conversion-to-kzalloc.patch drivers-message-fusion-mptctlc-mostly-kmalloc-memset-conversion-to-kzalloc.patch drivers-scsi-dpt_i2oc-kmalloc-memset-conversion-to-kzalloc.patch drivers-mtd-inftlmountc-kmalloc-memset-conversion-to-kcalloc.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html