From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756415Ab1FCVJq (ORCPT ); Fri, 3 Jun 2011 17:09:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16846 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756094Ab1FCVHd (ORCPT ); Fri, 3 Jun 2011 17:07:33 -0400 From: Vivek Goyal To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, axboe@kernel.dk Cc: vgoyal@redhat.com, arighi@develer.com, fengguang.wu@intel.com, jack@suse.cz, akpm@linux-foundation.org Subject: [PATCH 2/8] blk-throttle: do not enforce first queued bio check in tg_wait_dispatch Date: Fri, 3 Jun 2011 17:06:43 -0400 Message-Id: <1307135209-30539-3-git-send-email-vgoyal@redhat.com> In-Reply-To: <1307135209-30539-1-git-send-email-vgoyal@redhat.com> References: <1307135209-30539-1-git-send-email-vgoyal@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Soon we will be using same wait routines for checking the wait for task also and no bio is involved. So get rid of any bio dependencies and leave it to caller that if andy bio or task is queued in the group in same direction, then don't call this routine. Signed-off-by: Vivek Goyal --- block/blk-throttle.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 791116e..1259ce6 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -696,14 +696,6 @@ tg_wait_dispatch(struct throtl_data *td, struct throtl_grp *tg, struct bio *bio) bool rw = bio_data_dir(bio); unsigned long bps_wait = 0, iops_wait = 0, max_wait = 0; - /* - * Currently whole state machine of group depends on first bio - * queued in the group bio list. So one should not be calling - * this function with a different bio if there are other bios - * queued. - */ - BUG_ON(tg->nr_queued[rw] && bio != bio_list_peek(&tg->bio_lists[rw])); - /* If tg->bps = -1, then BW is unlimited */ if (tg->bps[rw] == -1 && tg->iops[rw] == -1) return 0; -- 1.7.4.4