From patchwork Wed Dec 5 17:10:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Zhou X-Patchwork-Id: 10714645 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A348E18A7 for ; Wed, 5 Dec 2018 17:11:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93CE82E151 for ; Wed, 5 Dec 2018 17:11:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9206C2E158; Wed, 5 Dec 2018 17:11:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 292EE2E151 for ; Wed, 5 Dec 2018 17:11:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728086AbeLERLO (ORCPT ); Wed, 5 Dec 2018 12:11:14 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:38192 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728390AbeLERLA (ORCPT ); Wed, 5 Dec 2018 12:11:00 -0500 Received: by mail-qt1-f193.google.com with SMTP id p17so23093288qtl.5; Wed, 05 Dec 2018 09:10:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4RJ1tad/iwAWBQQeHHB2twpexhanjcCN74RMuiZIAtk=; b=kmYpE1gweKQul0lI5r6bn7ORrRXmtiPUM3XG5sM76WAdv8UTmKYxDOTuwBvn3d1Mf+ kn0xipPefMUzT0YLZxN5fUgRr+pwCf4lIe6ujUSIf9Rq5T8WdyUNuR5dcJzvA0Wa6O1v qAn/H73ENz0wzL5uGbpJHikb2dO8n/YnqtLfxOaOCO9MuTIhNDbZAMDp+ldyByc8s8qu ocXh4w+3mBdaZpUdiHIlk1zho7y+YKmx6lbRSQwZkcTbF/IYNGXsBJhuoOAE3XGELEkL 0fejnZUWcuG+jOY7h15sbOthXzK6AIDW+XuZRIu86VVIVSbc+FoGyTZNkV9Gmy4Njbrl uPrQ== X-Gm-Message-State: AA+aEWaK2ZqBsdNmTOWsmVYaxURmYG4uqP9FQprB5GF8KHVL0Im88ZhJ uZ4Jyx02fpPEyr9sjE1EZYciwfxXxI8= X-Google-Smtp-Source: AFSGD/ULOaMhyogQlXxeSBzKEbzztc/aVocCQj1WC7ttVagQsYB9D52lMSrhQfVxmzACQ+0Ykw5jJQ== X-Received: by 2002:aed:39a1:: with SMTP id m30mr23603353qte.354.1544029858679; Wed, 05 Dec 2018 09:10:58 -0800 (PST) Received: from dennisz-mbp.thefacebook.com ([199.201.65.135]) by smtp.gmail.com with ESMTPSA id q15sm12098751qkl.81.2018.12.05.09.10.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Dec 2018 09:10:57 -0800 (PST) From: Dennis Zhou To: Jens Axboe , Tejun Heo , Johannes Weiner , Josef Bacik Cc: kernel-team@fb.com, linux-block@vger.kernel.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Dennis Zhou Subject: [PATCH 12/14] blkcg: remove bio_disassociate_task() Date: Wed, 5 Dec 2018 12:10:37 -0500 Message-Id: <20181205171039.73066-13-dennis@kernel.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20181205171039.73066-1-dennis@kernel.org> References: <20181205171039.73066-1-dennis@kernel.org> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that a bio only holds a blkg reference, so clean up is simply putting back that reference. Remove bio_disassociate_task() as it just calls bio_disassociate_blkg() and call the latter directly. Signed-off-by: Dennis Zhou Acked-by: Tejun Heo Reviewed-by: Josef Bacik --- block/bio.c | 11 +---------- include/linux/bio.h | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/block/bio.c b/block/bio.c index ce1e512dca5a..7ec5316e6ecc 100644 --- a/block/bio.c +++ b/block/bio.c @@ -244,7 +244,7 @@ struct bio_vec *bvec_alloc(gfp_t gfp_mask, int nr, unsigned long *idx, void bio_uninit(struct bio *bio) { - bio_disassociate_task(bio); + bio_disassociate_blkg(bio); } EXPORT_SYMBOL(bio_uninit); @@ -2073,15 +2073,6 @@ void bio_associate_blkg(struct bio *bio) } EXPORT_SYMBOL_GPL(bio_associate_blkg); -/** - * bio_disassociate_task - undo bio_associate_current() - * @bio: target bio - */ -void bio_disassociate_task(struct bio *bio) -{ - bio_disassociate_blkg(bio); -} - /** * bio_clone_blkg_association - clone blkg association from src to dst bio * @dst: destination bio diff --git a/include/linux/bio.h b/include/linux/bio.h index 84e1c4dc703a..7380b094dcca 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -516,7 +516,6 @@ void bio_disassociate_blkg(struct bio *bio); void bio_associate_blkg(struct bio *bio); void bio_associate_blkg_from_css(struct bio *bio, struct cgroup_subsys_state *css); -void bio_disassociate_task(struct bio *bio); void bio_clone_blkg_association(struct bio *dst, struct bio *src); #else /* CONFIG_BLK_CGROUP */ static inline void bio_disassociate_blkg(struct bio *bio) { } @@ -524,7 +523,6 @@ static inline void bio_associate_blkg(struct bio *bio) { } static inline void bio_associate_blkg_from_css(struct bio *bio, struct cgroup_subsys_state *css) { } -static inline void bio_disassociate_task(struct bio *bio) { } static inline void bio_clone_blkg_association(struct bio *dst, struct bio *src) { } #endif /* CONFIG_BLK_CGROUP */