The patch titled
fs/reiser4/plugin/file/cryptcompress.c: kmalloc + memset conversion to kzalloc
has been removed from the -mm tree. Its filename was
fs-reiser4-plugin-file-cryptcompressc-kmalloc-memset-conversion-to-kzalloc.patch
This patch was dropped because it was folded into reiser4.patch
------------------------------------------------------
Subject: fs/reiser4/plugin/file/cryptcompress.c: kmalloc + memset conversion to kzalloc
From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
fs/reiser4/plugin/file/cryptcompress.c | 101386 -> 101352 (-34 bytes)
fs/reiser4/plugin/file/cryptcompress.o | 456784 -> 456644 (-140 bytes)
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.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/reiser4/plugin/file/cryptcompress.c~fs-reiser4-plugin-file-cryptcompressc-kmalloc-memset-conversion-to-kzalloc fs/reiser4/plugin/file/cryptcompress.c
--- a/fs/reiser4/plugin/file/cryptcompress.c~fs-reiser4-plugin-file-cryptcompressc-kmalloc-memset-conversion-to-kzalloc
+++ a/fs/reiser4/plugin/file/cryptcompress.c
@@ -96,13 +96,13 @@ static void set_inode_crypto_info (struc
/* allocate a cipher key info */
struct reiser4_crypto_info * reiser4_alloc_crypto_info (struct inode * inode)
{
- struct reiser4_crypto_info * info;
+ struct reiser4_crypto_info *info;
int fipsize;
- info = kmalloc(sizeof(*info), reiser4_ctx_gfp_mask_get());
+ info = kzalloc(sizeof(*info), reiser4_ctx_gfp_mask_get());
if (!info)
return ERR_PTR(-ENOMEM);
- memset(info, 0, sizeof (*info));
+
fipsize = inode_digest_plugin(inode)->fipsize;
info->keyid = kmalloc(fipsize, reiser4_ctx_gfp_mask_get());
if (!info->keyid) {
_
Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are
origin.patch
reiser4.patch
fs-reiser4-plugin-file-cryptcompressc-kmalloc-memset-conversion-to-kzalloc.patch
reiser4-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-init_superc-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-plugin-inode_ops_renamec-kmalloc-memset-conversion-to-kzalloc.patch
fs-reiser4-ktxnmgrdc-kmalloc-memset-conversion-to-kzalloc.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
