From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + vfs-use-kmalloc-to-allocate-fdmem-if-possible-fix.patch added to -mm tree Date: Tue, 04 May 2010 15:27:52 -0700 Message-ID: <201005042227.o44MRq3M022641@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:51527 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934099Ab0EDW3J (ORCPT ); Tue, 4 May 2010 18:29:09 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: akpm@linux-foundation.org, adobriyan@gmail.com, avi@redhat.com, jslaby@suse.cz, mingo@elte.hu, paulmck@linux.vnet.ibm.com, penguin-kernel@i-love.sakura.ne.jp, peterz@infradead.org, viro@zeniv.linux.org.uk, xiaosuo@gmail.com The patch titled vfs-use-kmalloc-to-allocate-fdmem-if-possible-fix has been added to the -mm tree. Its filename is vfs-use-kmalloc-to-allocate-fdmem-if-possible-fix.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: vfs-use-kmalloc-to-allocate-fdmem-if-possible-fix From: Andrew Morton - use __GFP_NOWARN - uninline alloc_fdmem() and free_fdmem() Cc: "Paul E. McKenney" Cc: Alexander Viro Cc: Alexey Dobriyan Cc: Avi Kivity Cc: Changli Gao Cc: Ingo Molnar Cc: Jiri Slaby Cc: Peter Zijlstra Cc: Tetsuo Handa Signed-off-by: Andrew Morton --- fs/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN fs/file.c~vfs-use-kmalloc-to-allocate-fdmem-if-possible-fix fs/file.c --- a/fs/file.c~vfs-use-kmalloc-to-allocate-fdmem-if-possible-fix +++ a/fs/file.c @@ -43,19 +43,19 @@ static inline void *alloc_fdmem(unsigned { void *data; - data = kmalloc(size, GFP_KERNEL); + data = kmalloc(size, GFP_KERNEL|__GFP_NOWARN); if (data != NULL) return data; return vmalloc(size); } -static inline void free_fdmem(void *ptr) +static void free_fdmem(void *ptr) { is_vmalloc_addr(ptr) ? vfree(ptr) : kfree(ptr); } -static inline void __free_fdtable(struct fdtable *fdt) +static void __free_fdtable(struct fdtable *fdt) { free_fdmem(fdt->fd); free_fdmem(fdt->open_fds); _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch linux-next-fix-rejects.patch next-remove-localversion.patch i-need-old-gcc.patch include-linux-fsh-complete-hexification-of-fmode_-constants.patch compal-laptop-added-jhl90-battery-hwmon-interface.patch sched-introduce-get_cpu_iowait_time_us.patch jfs-free-sbi-memory-in-error-path.patch dib3000mc-reduce-large-stack-usage-fix.patch dib7000p-reduce-large-stack-usage-fix.patch fs-fscache-object-listc-fix-warning-on-32-bit.patch of-gpio-implement-gpiolib-notifier-hooks.patch hpet-factor-timer-allocate-from-open.patch led-driver-for-the-soekris-net5501-board.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch 3x59x-fix-pci-resource-management.patch backlight-add-s6e63m0-amoled-lcd-panel-driver-checkpatch-fixes.patch serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed.patch vfs-use-kmalloc-to-allocate-fdmem-if-possible-fix.patch mm-allow-config_migration-to-be-set-without-config_numa-or-memory-hot-remove.patch mm-export-unusable-free-space-index-via-debugfs.patch mmcompaction-direct-compact-when-a-high-order-allocation-fails.patch buffer_head-remove-redundant-test-from-wait_on_buffer-fix.patch wait_on_buffer-remove-the-buffer_locked-test.patch mm-introduce-free_pages_prepare-fix.patch frv-extend-gdbstub-to-support-more-features-of-gdb-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch kernel-wide-replace-ushort_max-short_max-and-short_min-with-ushrt_max-shrt_max-and-shrt_min-fix.patch dynamic_debug-fix-documentation-errors-checkpatch-fixes.patch lib-introduce-common-method-to-convert-hex-digits-fix.patch lib-introduce-common-method-to-convert-hex-digits-fix-fix.patch davinci-mmc-updates-to-suspend-resume-implementation-checkpatch-fixes.patch checkpatch-add-check-for-too-short-kconfig-descriptions-checkpatch-fixes.patch crc32-major-optimization-checkpatch-fixes.patch hwmon-driver-for-ti-tmp102-temperature-sensor.patch hwmon-driver-for-ti-tmp102-temperature-sensor-fix.patch hwmon-add-ti-ads7871-a-d-converter-driver-checkpatch-fixes.patch rtc-mxc-remove-unnecessary-clock-source-for-rtc-subsystem.patch gpiolib-make-names-array-and-its-values-const-fix.patch memcg-oom-kill-disable-and-oom-status-update-checkpatch-fixes.patch memcg-move-charge-of-file-pages-fix.patch proc-turn-signal_struct-count-into-int-nr_threads-checkpatch-fixes.patch fault-injection-add-cpu-notifier-error-injection-module-fix.patch ipc-semc-optimize-update_queue-for-bulk-wakeup-calls-fix.patch ipc-semc-move-wake_up_process-out-of-the-spinlock-section-fix.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch drivers-edac-convert-logging-messages-direct-uses-of-__file__-to-%s-__file-checkpatch-fixes.patch panic-allow-taint-flag-for-warnings-to-be-changed-from-taint_warn-checkpatch-fixes.patch aio-fix-the-compat-vectored-operations-checkpatch-fixes.patch x86_32-use-asm-generic-scatterlisth.patch numa-introduce-numa_mem_id-effective-local-memory-node-id-fix.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-writeback_inodes-implementation-fix.patch reiser4-fixups.patch reiser4-broke.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch