summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-11-30 05:29:23 +0100
committerAdrian Bunk <bunk@stusta.de>2006-11-30 05:29:23 +0100
commit93e06b4140cc018826bce4d97b0bf7c9ba05ae6e (patch)
tree784cacb45d99f7fc5fe15f378240f1042ae4e495
parentd99c5909859625f3c9c6dfee6caa3b2a7c0ef163 (diff)
downloadlinux-stable-93e06b4140cc018826bce4d97b0bf7c9ba05ae6e.tar.gz
linux-stable-93e06b4140cc018826bce4d97b0bf7c9ba05ae6e.tar.bz2
linux-stable-93e06b4140cc018826bce4d97b0bf7c9ba05ae6e.zip
BUG_ON conversion for fs/aio.c
This patch converts a if () BUG(); construct to BUG_ON(); which occupies less space, uses unlikely and is safer when BUG() is disabled. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r--fs/aio.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 94766599db00..277a5f2d18ad 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -367,8 +367,7 @@ void fastcall __put_ioctx(struct kioctx *ctx)
{
unsigned nr_events = ctx->max_reqs;
- if (unlikely(ctx->reqs_active))
- BUG();
+ BUG_ON(ctx->reqs_active);
cancel_delayed_work(&ctx->wq);
flush_workqueue(aio_wq);
@@ -505,8 +504,7 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req)
assert_spin_locked(&ctx->ctx_lock);
req->ki_users --;
- if (unlikely(req->ki_users < 0))
- BUG();
+ BUG_ON(req->ki_users < 0);
if (likely(req->ki_users))
return 0;
list_del(&req->ki_list); /* remove from active_reqs */