From 93be2029ca7c3f69f529daf0eace7d84c8b80d9e Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Thu, 30 Nov 2006 05:29:23 +0100 Subject: [PATCH] --- yaml --- r: 41162 b: refs/heads/master c: 93e06b4140cc018826bce4d97b0bf7c9ba05ae6e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/aio.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eaf3f55ee9c9..dfb72479abee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d99c5909859625f3c9c6dfee6caa3b2a7c0ef163 +refs/heads/master: 93e06b4140cc018826bce4d97b0bf7c9ba05ae6e diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c index 94766599db00..277a5f2d18ad 100644 --- a/trunk/fs/aio.c +++ b/trunk/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 */