The patch titled
fs/reiser4/plugin/inode_ops_rename.c: kmalloc + memset conversion to kzalloc
has been removed from the -mm tree. Its filename was
fs-reiser4-plugin-inode_ops_renamec-kmalloc-memset-conversion-to-kzalloc.patch
This patch was dropped because it was folded into reiser4.patch
------------------------------------------------------
Subject: fs/reiser4/plugin/inode_ops_rename.c: kmalloc + memset conversion to kzalloc
From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>
fs/reiser4/plugin/inode_ops_rename.c | 28474 -> 28344 (-130 bytes)
fs/reiser4/plugin/inode_ops_rename.o | 142600 -> 142476 (-124 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/inode_ops_rename.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff -puN fs/reiser4/plugin/inode_ops_rename.c~fs-reiser4-plugin-inode_ops_renamec-kmalloc-memset-conversion-to-kzalloc fs/reiser4/plugin/inode_ops_rename.c
--- a/fs/reiser4/plugin/inode_ops_rename.c~fs-reiser4-plugin-inode_ops_renamec-kmalloc-memset-conversion-to-kzalloc
+++ a/fs/reiser4/plugin/inode_ops_rename.c
@@ -392,16 +392,14 @@ int reiser4_rename_common(struct inode *
if (IS_ERR(ctx))
return PTR_ERR(ctx);
- old_entry = kmalloc(3 * sizeof(*old_entry) + 2 * sizeof(*new_lh) +
+ old_entry = kzalloc(3 * sizeof(*old_entry) + 2 * sizeof(*new_lh) +
sizeof(*dotdot_name) + sizeof(*dataonstack),
reiser4_ctx_gfp_mask_get());
- if (old_entry == NULL) {
+ if (!old_entry) {
context_set_commit_async(ctx);
reiser4_exit_context(ctx);
return RETERR(-ENOMEM);
}
- memset(old_entry, 0, 3 * sizeof(*old_entry) + 2 * sizeof(*new_lh) +
- sizeof(*dotdot_name) + sizeof(*dataonstack));
new_entry = old_entry + 1;
dotdot_entry = old_entry + 2;
_
Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are
origin.patch
reiser4.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
