From: Kent Overstreet <koverstreet@google.com>
To: linux-aio@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: zab@redhat.com, bcrl@kvack.org, jmoyer@redhat.com,
axboe@kernel.dk, viro@zeniv.linux.org.uk,
Kent Overstreet <koverstreet@google.com>
Subject: [PATCH 02/25] aio: remove dead code from aio.h
Date: Tue, 27 Nov 2012 19:19:29 -0800 [thread overview]
Message-ID: <1354072792-20779-3-git-send-email-koverstreet@google.com> (raw)
In-Reply-To: <1354072792-20779-1-git-send-email-koverstreet@google.com>
From: Zach Brown <zab@redhat.com>
Signed-off-by: Zach Brown <zab@redhat.com>
Signed-off-by: Kent Overstreet <koverstreet@google.com>
---
include/linux/aio.h | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/include/linux/aio.h b/include/linux/aio.h
index 31ff6db..b46a09f 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -9,44 +9,22 @@
#include <linux/atomic.h>
-#define AIO_MAXSEGS 4
-#define AIO_KIOGRP_NR_ATOMIC 8
-
struct kioctx;
-/* Notes on cancelling a kiocb:
- * If a kiocb is cancelled, aio_complete may return 0 to indicate
- * that cancel has not yet disposed of the kiocb. All cancel
- * operations *must* call aio_put_req to dispose of the kiocb
- * to guard against races with the completion code.
- */
-#define KIOCB_C_CANCELLED 0x01
-#define KIOCB_C_COMPLETE 0x02
-
#define KIOCB_SYNC_KEY (~0U)
/* ki_flags bits */
-/*
- * This may be used for cancel/retry serialization in the future, but
- * for now it's unused and we probably don't want modules to even
- * think they can use it.
- */
-/* #define KIF_LOCKED 0 */
#define KIF_KICKED 1
#define KIF_CANCELLED 2
-#define kiocbTryLock(iocb) test_and_set_bit(KIF_LOCKED, &(iocb)->ki_flags)
#define kiocbTryKick(iocb) test_and_set_bit(KIF_KICKED, &(iocb)->ki_flags)
-#define kiocbSetLocked(iocb) set_bit(KIF_LOCKED, &(iocb)->ki_flags)
#define kiocbSetKicked(iocb) set_bit(KIF_KICKED, &(iocb)->ki_flags)
#define kiocbSetCancelled(iocb) set_bit(KIF_CANCELLED, &(iocb)->ki_flags)
-#define kiocbClearLocked(iocb) clear_bit(KIF_LOCKED, &(iocb)->ki_flags)
#define kiocbClearKicked(iocb) clear_bit(KIF_KICKED, &(iocb)->ki_flags)
#define kiocbClearCancelled(iocb) clear_bit(KIF_CANCELLED, &(iocb)->ki_flags)
-#define kiocbIsLocked(iocb) test_bit(KIF_LOCKED, &(iocb)->ki_flags)
#define kiocbIsKicked(iocb) test_bit(KIF_KICKED, &(iocb)->ki_flags)
#define kiocbIsCancelled(iocb) test_bit(KIF_CANCELLED, &(iocb)->ki_flags)
@@ -207,8 +185,6 @@ struct kioctx {
};
/* prototypes */
-extern unsigned aio_max_size;
-
#ifdef CONFIG_AIO
extern ssize_t wait_on_sync_kiocb(struct kiocb *iocb);
extern int aio_put_req(struct kiocb *iocb);
--
1.7.12
next prev parent reply other threads:[~2012-11-28 3:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-28 3:19 [PATCH 00/25] AIO performance improvements/cleanups Kent Overstreet
2012-11-28 3:19 ` [PATCH 01/25] mm: remove old aio use_mm() comment Kent Overstreet
2012-11-28 3:19 ` Kent Overstreet [this message]
2012-11-28 3:19 ` [PATCH 03/25] gadget: remove only user of aio retry Kent Overstreet
2012-11-28 3:19 ` [PATCH 04/25] aio: remove retry-based AIO Kent Overstreet
2012-11-28 3:19 ` [PATCH 05/25] char: add aio_{read,write} to /dev/{null,zero} Kent Overstreet
2012-11-28 3:19 ` [PATCH 06/25] aio: Kill return value of aio_complete() Kent Overstreet
2012-11-28 3:19 ` [PATCH 07/25] aio: kiocb_cancel() Kent Overstreet
2012-11-28 3:19 ` [PATCH 08/25] aio: Move private stuff out of aio.h Kent Overstreet
2012-11-28 3:19 ` [PATCH 09/25] aio: dprintk() -> pr_debug() Kent Overstreet
2012-11-28 3:19 ` [PATCH 10/25] aio: do fget() after aio_get_req() Kent Overstreet
2012-11-28 3:19 ` [PATCH 11/25] aio: Make aio_put_req() lockless Kent Overstreet
2012-11-28 3:19 ` [PATCH 12/25] aio: Refcounting cleanup Kent Overstreet
2012-11-28 3:19 ` [PATCH 13/25] aio: Convert read_events() to hrtimers Kent Overstreet
2012-11-28 3:19 ` [PATCH 14/25] aio: Make aio_read_evt() more efficient Kent Overstreet
2012-11-28 3:19 ` [PATCH 15/25] aio: Use cancellation list lazily Kent Overstreet
2012-11-28 3:19 ` [PATCH 16/25] aio: Change reqs_active to include unreaped completions Kent Overstreet
2012-11-28 3:19 ` [PATCH 17/25] aio: Kill batch allocation Kent Overstreet
2012-11-28 3:19 ` [PATCH 18/25] aio: Kill struct aio_ring_info Kent Overstreet
2012-11-28 3:19 ` [PATCH 19/25] aio: Give shared kioctx fields their own cachelines Kent Overstreet
2012-11-28 3:19 ` [PATCH 20/25] aio: reqs_active -> reqs_available Kent Overstreet
2012-11-28 3:19 ` [PATCH 21/25] aio: percpu reqs_available Kent Overstreet
2012-11-28 3:19 ` [PATCH 22/25] Generic dynamic per cpu refcounting Kent Overstreet
2012-11-28 3:19 ` [PATCH 23/25] aio: Percpu ioctx refcount Kent Overstreet
2012-11-28 3:19 ` [PATCH 24/25] aio: use xchg() instead of completion_lock Kent Overstreet
2012-11-28 3:19 ` [PATCH 25/25] aio: Don't include aio.h in sched.h Kent Overstreet
-- strict thread matches above, loose matches on Subject: below --
2012-11-28 16:43 [PATCH 00/25] AIO performance improvements/cleanups Kent Overstreet
2012-11-28 16:43 ` [PATCH 02/25] aio: remove dead code from aio.h Kent Overstreet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354072792-20779-3-git-send-email-koverstreet@google.com \
--to=koverstreet@google.com \
--cc=axboe@kernel.dk \
--cc=bcrl@kvack.org \
--cc=jmoyer@redhat.com \
--cc=linux-aio@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=zab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).