The patch titled flex_array-add-helpers-to-get-and-put-to-make-pointers-easy-to-use-cleanup has been added to the -mm tree. Its filename is flex_array-add-helpers-to-get-and-put-to-make-pointers-easy-to-use-cleanup.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: flex_array-add-helpers-to-get-and-put-to-make-pointers-easy-to-use-cleanup From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> simplification suggested by Joe Cc: Dave Hansen <dave@xxxxxxxxxxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Eric Paris <eparis@xxxxxxxxxx> Cc: James Morris <jmorris@xxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/flex_array.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff -puN include/linux/flex_array.h~flex_array-add-helpers-to-get-and-put-to-make-pointers-easy-to-use-cleanup include/linux/flex_array.h --- a/include/linux/flex_array.h~flex_array-add-helpers-to-get-and-put-to-make-pointers-easy-to-use-cleanup +++ a/include/linux/flex_array.h @@ -70,10 +70,9 @@ int flex_array_clear(struct flex_array * void *flex_array_get(struct flex_array *fa, unsigned int element_nr); int flex_array_shrink(struct flex_array *fa); -#define flex_array_put_ptr(fa, nr, src, gfp) ({ \ - void *_src = (src); \ - flex_array_put((fa), (nr), &_src, (gfp)); \ - }) +#define flex_array_put_ptr(fa, nr, src, gfp) \ + flex_array_put(fa, nr, &(void *)(src), gfp) + void *flex_array_get_ptr(struct flex_array *fa, unsigned int element_nr); #endif /* _FLEX_ARRAY_H */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch fs-inodec-work-around-bug.patch i-need-old-gcc.patch include-linux-fsh-complete-hexification-of-fmode_-constants.patch mm-vmap-area-cache.patch acpi-fix-bogus-preemption-logic.patch parport-prevent-arm-boards-frmo-crashing-when-cups-is-loaded-fix.patch gcc-46-btrfs-clean-up-unused-variables-bugs.patch hpet-factor-timer-allocate-from-open.patch revert-old-timer-added-usleep_range-timer.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch security-add-const-to-security_task_setscheduler.patch sched-make-sched_param-argument-static-variables-in-some-sched_setscheduler-caller.patch scsi-remove-private-bit-macros.patch fs-bio-integrityc-return-enomem-on-kmalloc-failure.patch usb-storage-add-new-no_read_disc_info-quirk-fix.patch vfs-use-kmalloc-to-allocate-fdmem-if-possible.patch mm.patch mm-track-the-root-oldest-anon_vma-fix.patch oom-improve-commentary-in-dump_tasks.patch oom-sacrifice-child-with-highest-badness-score-for-parent-protect-dereferencing-of-tasks-comm.patch oom-select-task-from-tasklist-for-mempolicy-ooms-add-has_intersects_mems_allowed-uma-variant.patch mempolicy-reduce-stack-size-of-migrate_pages-fix.patch shmem-reduce-one-time-of-locking-in-pagefault-fix.patch rmap-always-use-anon_vma-root-pointer-fix-false-positive-bug_on-in-__page_set_anon_rmap-checkpatch-fixes.patch vmscan-tracing-add-trace-events-for-lru-page-isolation-checkpatch-fixes.patch vmscan-simplify-shrink_inactive_list-checkpatch-fixes.patch vmscan-remove-unnecessary-temporary-vars-in-do_try_to_free_pages-checkpatch-fixes.patch oom-dont-try-to-kill-oom_unkillable-child-checkpatch-fixes.patch oom-move-badness-declaration-into-oomh.patch oom-move-badness-declaration-into-oomh-fix.patch writeback-avoid-unnecessary-calculation-of-bdi-dirty-thresholds-fix.patch vmscan-shrink_slab-require-number-of-lru_pages-not-page-order-fix-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch include-linux-compiler-gcch-use-__same_type-in-__must_be_array.patch drivers-misc-support-for-the-pressure-sensor-bmp085-from-bosch-sensortec-fix.patch drivers-misc-support-for-the-pressure-sensor-bmp085-from-bosch-sensortec-update-checkpatch-fixes.patch flex_array-add-helpers-to-get-and-put-to-make-pointers-easy-to-use-cleanup.patch edd-fix-possible-memory-leak-in-edd_init-error-path-fix.patch mmc-recognize-csd-structure-fix.patch mmc-fix-all-hangs-related-to-mmc-sd-card-insert-removal-during-suspend-resume.patch checkpatch-prefer-usleep_range-over-udelay-fix.patch hwmon-add-support-for-jedec-jc-424-compliant-temperature-sensors.patch drivers-hwmon-coretempc-remove-unneeded-ifdef-config_hotplug_cpu.patch fix-vc-vc_origin-on-take_over_console-checkpatch-fixes.patch rtc-fixes-and-new-functionality-for-fm3130-fix.patch rtc-add-support-for-ds3232-rtc-fix.patch drivers-video-via-via-gpioc-fix-warning.patch drivers-video-igafbc-make-igafb_setup-and-igafb_init-static.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch lib-bugc-make-warn-implementation-match-the-kernel-panicc-one-checkpatch-fixes.patch fs-sysv-v7-adjust-sanity-checks-for-some-volumes-checkpatch-fixes.patch fs-sysv-superc-add-support-for-non-pdp11-v7-filesystems-checkpatch-fixes.patch kfifo-add-example-files-to-the-kernel-sample-directory-checkpatch-fixes.patch vfs-add-super-operation-writeback_inodes-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4-export-find_get_pages.patch reiser4.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-fixups.patch reiser4-broke.patch journal_add_journal_head-debug.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.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