Subject: [folded-merged] aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time-fix.patch removed from -mm tree
To: akpm@xxxxxxxxxxxxxxxxxxxx,koverstreet@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 24 May 2013 15:41:23 -0700
The patch titled
Subject: aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time-fix
has been removed from the -mm tree. Its filename was
aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time-fix.patch
This patch was dropped because it was folded into aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time-fix
fix build
fs/aio.c:1321:1: error: unterminated argument list invoking macro "wait_event"
fs/aio.c: In function 'free_ioctx':
fs/aio.c:310: error: 'wait_event' undeclared (first use in this function)
fs/aio.c:310: error: (Each undeclared identifier is reported only once
fs/aio.c:310: error: for each function it appears in.)
fs/aio.c:310: error: expected ';' at end of input
fs/aio.c:310: error: expected declaration or statement at end of input
fs/aio.c:310: error: expected declaration or statement at end of input
Cc: Kent Overstreet <koverstreet@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/aio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/aio.c~aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time-fix fs/aio.c
--- a/fs/aio.c~aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time-fix
+++ a/fs/aio.c
@@ -308,8 +308,8 @@ static void free_ioctx(struct kioctx *ct
while (atomic_read(&ctx->reqs_active) > 0) {
wait_event(ctx->wait,
- (head != ctx->tail) ||
- (atomic_read(&ctx->reqs_active) <= 0);
+ head != ctx->tail ||
+ atomic_read(&ctx->reqs_active) <= 0);
avail = (head <= ctx->tail ? ctx->tail : ctx->nr_events) - head;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu.patch
drivers-video-implement-a-simple-framebuffer-driver.patch
shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix.patch
revert-selftest-add-simple-test-for-soft-dirty-bit.patch
mm-pagewalkc-walk_page_range-should-avoid-vm_pfnmap-areas.patch
aio-fix-kioctx-not-being-freed-after-cancellation-at-exit-time.patch
linux-next.patch
linux-next-git-rejects.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix.patch
sound-soc-codecs-si476xc-dont-use-0bnnn.patch
drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix.patch
posix-timers-correctly-get-dying-task-time-sample-in-posix_cpu_timer_schedule.patch
mm.patch
clear_refs-sanitize-accepted-commands-declaration.patch
mm-remove-compressed-copy-from-zram-in-memory-fix.patch
memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix.patch
include-linux-mmh-add-page_aligned-helper.patch
vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment-fix.patch
vmalloc-introduce-remap_vmalloc_range_partial-fix.patch
vmcore-allocate-elf-note-segment-in-the-2nd-kernel-vmalloc-memory-fix.patch
vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix.patch
vmcore-support-mmap-on-proc-vmcore-fix.patch
include-linux-mmzoneh-cleanups.patch
include-linux-mmzoneh-cleanups-fix.patch
drop_caches-add-some-documentation-and-info-messsge.patch
memcg-debugging-facility-to-access-dangling-memcgs-fix.patch
dump_stack-serialize-the-output-from-dump_stack-fix.patch
panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix.patch
lib-bitmapc-speed-up-bitmap_find_free_region-fix.patch
rbtree-remove-unneeded-include-fix.patch
checkpatch-warn-when-using-gccs-binary-constant-extension.patch
binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch
fat-additions-to-support-fat_fallocate-fix.patch
idr-print-a-stack-dump-after-ida_remove-warning-fix.patch
partitions-add-aix-lvm-partition-support-files-checkpatch-fixes.patch
drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix.patch
lib-add-lz4-compressor-module-fix.patch
crypto-add-lz4-cryptographic-api-fix.patch
debugging-keep-track-of-page-owners-fix-2-fix.patch
debugging-keep-track-of-page-owners-fix-2-fix-fix-fix.patch
journal_add_journal_head-debug.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
put_bh-debug.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
