The patch titled Subject: aoe: cleanup an allocation a bit has been removed from the -mm tree. Its filename was aoe-kernel-thread-handles-i-o-completions-for-simple-locking-fix.patch This patch was dropped because it was folded into aoe-kernel-thread-handles-i-o-completions-for-simple-locking.patch ------------------------------------------------------ From: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Subject: aoe: cleanup an allocation a bit We changed this recently so we can just use kzalloc() here instead of kcalloc(1, ...). Kernel style prefers sizeof(*t) over sizeof *t. The kfree(t) is a no-op now as well so that can be removed. Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Cc: Ed Cashin <ecashin@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/aoe/aoecmd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/block/aoe/aoecmd.c~aoe-kernel-thread-handles-i-o-completions-for-simple-locking-fix drivers/block/aoe/aoecmd.c --- a/drivers/block/aoe/aoecmd.c~aoe-kernel-thread-handles-i-o-completions-for-simple-locking-fix +++ a/drivers/block/aoe/aoecmd.c @@ -1157,9 +1157,8 @@ addtgt(struct aoedev *d, char *addr, ulo "aoe: device addtgt failure; too many targets\n"); return NULL; } - t = kcalloc(1, sizeof *t, GFP_ATOMIC); + t = kzalloc(sizeof(*t), GFP_ATOMIC); if (!t) { - kfree(t); printk(KERN_INFO "aoe: cannot allocate memory to add target\n"); return NULL; } _ Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are origin.patch checkpatch-update-suggested-printk-conversions.patch aoe-kernel-thread-handles-i-o-completions-for-simple-locking.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