From patchwork Tue Apr 5 12:07:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 8750811 Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AB85A9F7C9 for ; Tue, 5 Apr 2016 12:10:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE043203A5 for ; Tue, 5 Apr 2016 12:10:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4D5920204 for ; Tue, 5 Apr 2016 12:10:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932785AbcDEMJq (ORCPT ); Tue, 5 Apr 2016 08:09:46 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:33329 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932825AbcDEMJn (ORCPT ); Tue, 5 Apr 2016 08:09:43 -0400 Received: by mail-pa0-f66.google.com with SMTP id q6so1148889pav.0; Tue, 05 Apr 2016 05:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GKiAcWgOVXyR1Il3F6V9RQ+orkRwKmxCndlIOlkdtQE=; b=PEWo73zablGZ2LlfNTacMPBt0AG6lC0rekMjeOHOi7dcTpZmosl3xEisGk7tmcnhNo Xcc8biKX3Oj2AXd3d6Y2uSvrTzztXC5ZInj8WNOSV+LwFIB9FBR2WYrvmpUuTJf2//8W HAqSo9fUEAeKRq9DsQ0cMts+hRITXPbH5DMY6wHblv8LSsMrKp7E/AcDaSw1oU2hWntR JWPDov+wiWg0WWpvXUtcyV1jcd9jxuFuNKXIOF0bc4KMlPxgzcy2mj4jykhbrS9oV2SW mlqNZfM1zUiNWM/DLKbIEKP03JqeqKxZxNqGd7E3KI/znO0x5eVcNI4gYXIQNz8fgtDB bvdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GKiAcWgOVXyR1Il3F6V9RQ+orkRwKmxCndlIOlkdtQE=; b=OkPt0c/yqd+xEiL6ROVZLu1CWkMZLY3C7BRreX3+keF6gbXdTApimMaLPrMPjPimbs oLs2Jj2lpAOAylWqEfPuKb5x+hxqDTt3P6zcG8iivGCTb41n5wh6gYfNFSAe0M0mQ2/g aIyejNuJOVV/eskxy57FqfCXVq3EiqavCVvp+79s0KCWoAeewvL8oVInvqu3OE8Eq63Y nE+msi4Wtwl46F2yrAwQVKFqqCJKA928LRFDLzlCcu9e8Hdkp9eZf24KvBaGCDq/bQEx GIgiKIHMSEU6vM8DfKuBAMu3d5njXFi70w37HaNG9E+U5UJJz8kR0pMlWau+BjAKHPVd FL0g== X-Gm-Message-State: AD7BkJJwurw3JMFsPs00OtSbayuDsB/mzbpIs7K7Uf1pQodQ/UgHgnGMIg4iElcEeisZUA== X-Received: by 10.66.55.6 with SMTP id n6mr62250645pap.35.1459858183045; Tue, 05 Apr 2016 05:09:43 -0700 (PDT) Received: from localhost (56.34.213.162.lcy-01.canonistack.canonical.com. [162.213.34.56]) by smtp.gmail.com with ESMTPSA id 8sm46561695pfk.69.2016.04.05.05.09.39 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 05 Apr 2016 05:09:42 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Boaz Harrosh , Ming Lei , Joern Engel , Prasad Joshi , logfs@logfs.org (open list:LogFS) Subject: [PATCH 23/27] fs: logfs: use bio_add_page() in __bdev_writeseg() Date: Tue, 5 Apr 2016 20:07:38 +0800 Message-Id: <1459858062-21075-9-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459858062-21075-1-git-send-email-tom.leiming@gmail.com> References: <1459858062-21075-1-git-send-email-tom.leiming@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Also this patch simplify the code a bit. Signed-off-by: Ming Lei --- fs/logfs/dev_bdev.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c index 957c237..1df84e0 100644 --- a/fs/logfs/dev_bdev.c +++ b/fs/logfs/dev_bdev.c @@ -72,54 +72,45 @@ static int __bdev_writeseg(struct super_block *sb, u64 ofs, pgoff_t index, { struct logfs_super *super = logfs_super(sb); struct address_space *mapping = super->s_mapping_inode->i_mapping; - struct bio *bio; + struct bio *bio = NULL; struct page *page; unsigned int max_pages; - int i; + int i, ret; max_pages = min_t(size_t, nr_pages, BIO_MAX_PAGES); - bio = bio_alloc(GFP_NOFS, max_pages); - BUG_ON(!bio); - for (i = 0; i < nr_pages; i++) { - if (i >= max_pages) { - /* Block layer cannot split bios :( */ - bio->bi_vcnt = i; - bio->bi_iter.bi_size = i * PAGE_SIZE; + if (!bio) { + bio = bio_alloc(GFP_NOFS, max_pages); + BUG_ON(!bio); bio->bi_bdev = super->s_bdev; bio->bi_iter.bi_sector = ofs >> 9; bio->bi_private = sb; bio->bi_end_io = writeseg_end_io; - atomic_inc(&super->s_pending_writes); - submit_bio(WRITE, bio); - - ofs += i * PAGE_SIZE; - index += i; - nr_pages -= i; - i = 0; - - bio = bio_alloc(GFP_NOFS, max_pages); - BUG_ON(!bio); } + page = find_lock_page(mapping, index + i); BUG_ON(!page); - bio->bi_io_vec[i].bv_page = page; - bio->bi_io_vec[i].bv_len = PAGE_SIZE; - bio->bi_io_vec[i].bv_offset = 0; + + ret = bio_add_page(bio, page, PAGE_SIZE, 0); BUG_ON(PageWriteback(page)); set_page_writeback(page); unlock_page(page); + if (!ret) { + /* Block layer cannot split bios :( */ + ofs += bio->bi_iter.bi_size; + atomic_inc(&super->s_pending_writes); + submit_bio(WRITE, bio); + + bio = NULL; + } + } + + if (bio) { + atomic_inc(&super->s_pending_writes); + submit_bio(WRITE, bio); } - bio->bi_vcnt = nr_pages; - bio->bi_iter.bi_size = nr_pages * PAGE_SIZE; - bio->bi_bdev = super->s_bdev; - bio->bi_iter.bi_sector = ofs >> 9; - bio->bi_private = sb; - bio->bi_end_io = writeseg_end_io; - atomic_inc(&super->s_pending_writes); - submit_bio(WRITE, bio); return 0; }