The patch titled Subject: ocfs2: one function call less in ocfs2_init_slot_info() after error detection has been removed from the -mm tree. Its filename was ocfs2-one-function-call-less-in-ocfs2_init_slot_info-after-error-detection.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> Subject: ocfs2: one function call less in ocfs2_init_slot_info() after error detection __ocfs2_free_slot_info() was called by ocfs2_init_slot_info() even if a call of the kzalloc() function failed. Return from this implementation directly after corresponding exception handling. Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/slot_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/ocfs2/slot_map.c~ocfs2-one-function-call-less-in-ocfs2_init_slot_info-after-error-detection fs/ocfs2/slot_map.c --- a/fs/ocfs2/slot_map.c~ocfs2-one-function-call-less-in-ocfs2_init_slot_info-after-error-detection +++ a/fs/ocfs2/slot_map.c @@ -427,7 +427,7 @@ int ocfs2_init_slot_info(struct ocfs2_su if (!si) { status = -ENOMEM; mlog_errno(status); - goto bail; + return status; } si->si_extended = ocfs2_uses_extended_slot_map(osb); _ Patches currently in -mm which might be from elfring@xxxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.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