The patch titled
Subject: aio-allocate-kiocbs-in-batches-fix
has been removed from the -mm tree. Its filename was
aio-allocate-kiocbs-in-batches-fix.patch
This patch was dropped because it was folded into aio-allocate-kiocbs-in-batches.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: aio-allocate-kiocbs-in-batches-fix
- coding-style fixes
- improve variable name(s)
- fix typo(s)
- use new kmap_atomic() interface
- change comment to use the number of columns God gave us
- use "bool" for a boolean
Cc: Jeff Moyer <jmoyer@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxx>
---
fs/aio.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff -puN fs/aio.c~aio-allocate-kiocbs-in-batches-fix fs/aio.c
--- a/fs/aio.c~aio-allocate-kiocbs-in-batches-fix
+++ a/fs/aio.c
@@ -468,12 +468,14 @@ struct kiocb_stash {
unsigned used;
struct kiocb *kiocbs[KIOCB_STASH_SIZE];
};
-static void kiocb_stash_init(struct kiocb_stash *stash, int nr)
+
+static void kiocb_stash_init(struct kiocb_stash *stash, int total)
{
stash->head = stash->tail = 0;
- stash->total = nr;
+ stash->total = total;
stash->used = 0;
}
+
static void kiocb_stash_free(struct kiocb_stash *stash, int used)
{
int i;
@@ -481,24 +483,25 @@ static void kiocb_stash_free(struct kioc
for (i = used; i < stash->total; i++)
kmem_cache_free(kiocb_cachep, stash->kiocbs[i]);
}
+
static inline unsigned kiocb_stash_avail(struct kiocb_stash *stash)
{
return stash->tail - stash->head;
}
/*
- * Allocate nr kiocbs. This aovids taking and dropping the lock a
+ * Allocate nr kiocbs. This avoids taking and dropping the lock a
* lot during setup.
*/
static int kiocb_stash_refill(struct kioctx *ctx, struct kiocb_stash *stash)
{
int i, nr = KIOCB_STASH_SIZE;
int avail;
- int called_fput = 0;
+ bool called_fput;
struct aio_ring *ring;
/*
- * Allocate the requests up-front. Later, we'll trim the list
+ * Allocate the requests up front. Later, we'll trim the list
* if there isn't enough room in the completion ring.
*/
stash->head = 0;
@@ -509,15 +512,14 @@ static int kiocb_stash_refill(struct kio
for (i = 0; i < nr; i++) {
stash->kiocbs[i] = __aio_get_req(ctx);
if (!stash->kiocbs[i] && !called_fput) {
- /* Handle a potential starvation case --
- * should be exceedingly rare as requests will
- * be stuck on fput_head only if the
- * aio_fput_routine is delayed and the
- * requests were the last user of the struct
- * file.
+ /*
+ * Handle a potential starvation case. Should be
+ * exceedingly rare as requests will be stuck on
+ * fput_head only if the aio_fput_routine is delayed and
+ * the requests were the last user of the struct file.
*/
aio_fput_routine(NULL);
- called_fput = 1;
+ called_fput = true;
i--;
continue;
}
@@ -525,7 +527,7 @@ static int kiocb_stash_refill(struct kio
stash->tail = i;
spin_lock_irq(&ctx->ctx_lock);
- ring = kmap_atomic(ctx->ring_info.ring_pages[0], KM_USER0);
+ ring = kmap_atomic(ctx->ring_info.ring_pages[0]);
avail = aio_ring_avail(&ctx->ring_info, ring) + ctx->reqs_active;
if (avail < stash->tail) {
@@ -538,7 +540,7 @@ static int kiocb_stash_refill(struct kio
list_add(&stash->kiocbs[i]->ki_list, &ctx->active_reqs);
ctx->reqs_active++;
}
- kunmap_atomic(ring, KM_USER0);
+ kunmap_atomic(ring);
spin_unlock_irq(&ctx->ctx_lock);
if (stash->tail == 0)
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
linux-next.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long.patch
arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch
leds-new-pcengines-alix-system-driver-enables-leds-via-gpio-interface.patch
drivers-message-fusion-mptbasec-ensure-nul-termination-of-mptcallbacksname-elements.patch
block-document-blk-plug.patch
block-blk-sysfsc-fix-kerneldoc-references.patch
mm.patch
mm-add-comments-to-explain-mm_struct-fields-fix.patch
vmscan-use-atomic-long-for-shrinker-batching-fix.patch
mm-avoid-null-pointer-access-in-vm_struct-via-proc-vmallocinfo.patch
thp-mremap-support-and-tlb-optimization-fix.patch
thp-mremap-support-and-tlb-optimization-fix-fix.patch
mm-neaten-warn_alloc_failed-fix.patch
debug-pagealloc-add-support-for-highmem-pages-fix.patch
mm-compaction-compact-unevictable-pages-checkpatch-fixes.patch
mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch
mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix.patch
mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix.patch
include-linux-securityh-fix-security_inode_init_security-arg.patch
frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch
hpet-factor-timer-allocate-from-open.patch
dynamic_debug-consolidate-repetitive-struct-_ddebug-descriptor-definitions.patch
dynamic_debug-use-a-single-printk-to-emit-messages.patch
treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes.patch
fs-nameic-remove-unused-getname_flags.patch
leds-route-kbd-leds-through-the-generic-leds-layer.patch
leds-route-kbd-leds-through-the-generic-leds-layer-fix.patch
lib-bitmapc-quiet-sparse-noise-about-address-space-fix.patch
llist-return-whether-list-is-empty-before-adding-in-llist_add-fix.patch
lib-crc-add-slice-by-8-algorithm-to-crc32c-fix.patch
lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch
fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch
fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch
ipc-introduce-shm_rmid_forced-sysctl-testing.patch
sysctl-add-support-for-poll-fix.patch
pps-new-client-driver-using-gpio-fix.patch
scatterlist-new-helper-functions.patch
scatterlist-new-helper-functions-update-fix.patch
memstick-add-support-for-legacy-memorysticks-fix.patch
kexec-remove-kmsg_dump_kexec.patch
aio-allocate-kiocbs-in-batches.patch
aio-allocate-kiocbs-in-batches-fix-fix.patch
dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes.patch
dio-inline-the-complete-submission-path-v2-checkpatch-fixes.patch
dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes.patch
dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes.patch
journal_add_journal_head-debug.patch
mutex-subsystem-synchro-test-module-fix.patch
slab-leaks3-default-y.patch
put_bh-debug.patch
memblock-add-input-size-checking-to-memblock_find_region.patch
memblock-add-input-size-checking-to-memblock_find_region-fix.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
