The patch titled Subject: ocfs2: use swap() in dx_leaf_sort_swap() has been removed from the -mm tree. Its filename was ocfs2-use-swap-in-dx_leaf_sort_swap.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Fabian Frederick <fabf@xxxxxxxxx> Subject: ocfs2: use swap() in dx_leaf_sort_swap() Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> Cc: Julia Lawall <julia.lawall@xxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/dir.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff -puN fs/ocfs2/dir.c~ocfs2-use-swap-in-dx_leaf_sort_swap fs/ocfs2/dir.c --- a/fs/ocfs2/dir.c~ocfs2-use-swap-in-dx_leaf_sort_swap +++ a/fs/ocfs2/dir.c @@ -3543,13 +3543,10 @@ static void dx_leaf_sort_swap(void *a, v { struct ocfs2_dx_entry *entry1 = a; struct ocfs2_dx_entry *entry2 = b; - struct ocfs2_dx_entry tmp; BUG_ON(size != sizeof(*entry1)); - tmp = *entry1; - *entry1 = *entry2; - *entry2 = tmp; + swap(*entry1, *entry2); } static int ocfs2_dx_leaf_same_major(struct ocfs2_dx_leaf *dx_leaf) _ Patches currently in -mm which might be from fabf@xxxxxxxxx are origin.patch fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch fs-affs-inodec-remove-unneeded-initialization.patch fs-affs-amigaffsc-remove-unneeded-initialization.patch fs-affs-symlinkc-remove-unneeded-err-variable.patch w1-masters-omap_hdq-add-support-for-1-wire-mode.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