2006-09-27 16:36:48

by Rolf Eike Beer

[permalink] [raw]
Subject: [PATCH][AIO] Remove BUG_ON(unlikely) in include/linux/aio.h

BUG_ON() does this unlikely check itself, as bugs in Linux are unlikely
anyway :)

Signed-off-by: Rolf Eike Beer <[email protected]>
Acked-by: Zach Brown <[email protected]>

---
commit 0764f582b694c80d0cd1db8f3320db5112b9053c
tree ed9907f05b09d7b16d8c1a6e4013eaffd0f2b42b
parent f0544b86176beef7fa05f4c009bc46f142717cbf
author Rolf Eike Beer <[email protected]> Fri, 28 Jul 2006 10:30:30 +0200
committer Rolf Eike Beer <[email protected]> Fri, 28 Jul 2006 10:30:30 +0200

include/linux/aio.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/aio.h b/include/linux/aio.h
index 00c8efa..8a01933 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -213,11 +213,11 @@ int FASTCALL(io_submit_one(struct kioctx
struct iocb *iocb));

#define get_ioctx(kioctx) do { \
- BUG_ON(unlikely(atomic_read(&(kioctx)->users) <= 0)); \
+ BUG_ON(atomic_read(&(kioctx)->users) <= 0); \
atomic_inc(&(kioctx)->users); \
} while (0)
#define put_ioctx(kioctx) do { \
- BUG_ON(unlikely(atomic_read(&(kioctx)->users) <= 0)); \
+ BUG_ON(atomic_read(&(kioctx)->users) <= 0); \
if (unlikely(atomic_dec_and_test(&(kioctx)->users))) \
__put_ioctx(kioctx); \
} while (0)