aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRolf Eike Beer <eike-kernel@sf-tec.de>2006-09-30 23:28:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 00:39:24 -0700
commit3a2711116073db258224afd2cc0f478bdf305575 (patch)
tree83117f5b2846833102918329e3c17607ddd08d9e
parent9ba0bdfd040b2893bcddfec7165b545d22fc2dc7 (diff)
[PATCH] 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 <eike-kernel@sf-tec.de> Acked-by: Zach Brown <zach.brown@oracle.com> Acked-by: Benjamin LaHaise <benjamin.c.lahaise@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/aio.h4
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 *ctx, struct iocb __user *user_iocb,
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)