The patch titled block: turn some buggy macros into C functions has been added to the -mm tree. Its filename is block-turn-some-buggy-macros-into-c-functions.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: block: turn some buggy macros into C functions From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> please fill in the comments? Cc: Nikanth Karthikesan <knikanth@xxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/blkdev.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff -puN include/linux/blkdev.h~block-turn-some-buggy-macros-into-c-functions include/linux/blkdev.h --- a/include/linux/blkdev.h~block-turn-some-buggy-macros-into-c-functions +++ a/include/linux/blkdev.h @@ -668,11 +668,23 @@ static inline void blk_clear_queue_full( */ #define RQ_NOMERGE_FLAGS \ (REQ_NOMERGE | REQ_STARTED | REQ_HARDBARRIER | REQ_SOFTBARRIER) -#define rq_mergeable(rq) \ - (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && \ - (blk_discard_rq(rq) || blk_fs_request(rq))) -#define rq_accountable(rq) \ - (blk_discard_rq(rq) || blk_fs_request(rq)) + +/* + * nice comment goes here + */ +static inline bool rq_mergeable(const struct request *rq) +{ + return !((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && + (blk_discard_rq(rq) || blk_fs_request(rq)); +} + +/* + * here too + */ +static inline bool rq_accountable(const struct request *rq) +{ + return blk_discard_rq(rq) || blk_fs_request(rq); +} /* * q->prep_rq_fn return values _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i2c-too-much-compiler-noise.patch linux-next.patch next-remove-localversion.patch i-need-old-gcc.patch arch-x86-kernel-cpu-cpufreq-acpi-cpufreqc-avoid-cross-cpu-interrupts.patch arch-x86-kernel-apic-io_apicc-conditionally-compile-eoi_ioapic_irq.patch drivers-gpu-drm-i915-intel_fbc-remove-sysrq-g-handler.patch input-bcm5974-declare-alignment-usage.patch input-keyboard-introduce-lm8323-driver.patch drivers-input-xpadc-improve-xbox-360-wireless-support-and-add-sysfs-interface-checkpatch-fixes.patch input-documentation-input-xpadtxt-update-for-new-driver-functionality-checkpatch-fixes.patch mtd-flex-onenand-support.patch misdn-l1oip-reduce-stack-memory-footprint.patch drivers-net-82596c-suppress-warnings.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets-v2.patch block-turn-some-buggy-macros-into-c-functions.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch libfs-make-simple_read_from_buffer-conventional.patch scsi-dpt_i2o-is-bust-on-ia64.patch drivers-platform-x86-toshiba_acpic-fix-acpi_install_notify_handler-arg.patch squashfs-fix-breakage-when-pagesize-blocksize-checkpatch-fixes.patch mm-consolidate-init_mm-definition-fix.patch readahead-record-mmap-read-around-states-in-file_ra_state-checkpatch-fixes.patch mm-clean-up-get_user_pages_fast-documentation-checkpatch-fixes.patch ksm-add-get_pte-helper-function-fetching-pte-for-va-fix.patch ksm-add-ksm-kernel-shared-memory-driver-checkpatch-fixes.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch m68k-count-can-reach-51-not-50.patch rb_tree-reorganize-code-in-rb_erase-for-additional-changes-checkpatch-fixes.patch flat-fix-data-sections-alignment.patch rtc-add-stand-alone-driver-for-rx8025-chip-is-broken.patch drivers-char-memc-memory_open-cleanup-lookup-minor-device-number-from-devlist-checkpatch-fixes.patch edac-add-cpc925-memory-controller-driver-cleanup.patch edac-add-edac_device_alloc_index-cleanup.patch gru-support-for-asynchronous-gru-instructions-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.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