From patchwork Fri Nov 11 12:05:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9422877 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 11FFE60512 for ; Fri, 11 Nov 2016 12:07:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 042C129733 for ; Fri, 11 Nov 2016 12:07:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3EB8297A6; Fri, 11 Nov 2016 12:07:43 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable 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 890B72978A for ; Fri, 11 Nov 2016 12:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933797AbcKKMHN (ORCPT ); Fri, 11 Nov 2016 07:07:13 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33364 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933717AbcKKMHL (ORCPT ); Fri, 11 Nov 2016 07:07:11 -0500 Received: by mail-pf0-f196.google.com with SMTP id 144so2419251pfv.0; Fri, 11 Nov 2016 04:07:10 -0800 (PST) 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=D5jsXS7fR37ygLt1OS5QuKCEz9u9mbHIARyDzpYE5E8=; b=eniKinwPFTEIki69LVPntRN4ntHegYtMZF1r7hmIfzdMWvoY/s/nsQFBnEewHdU7/l uPFCcsQRQTc91llmXQUHbGr/09tvlDg3yPjGCy/qSH0hApkRRf35elJzOZ0AIjLb9D+J mo4l2Kil1cqq5twdXIeEHURMN1cVsBn3Nyv5xG7/72u7rPoPzLYRN7hIO+yJQ1ulGTQg NEFnwLmbqWdHHbmMQoOGCe2ADH4OwOG90BojKjB09vALUKzue2BuPsDB9gRmyd9juuNr G4wVHctyICd8SKKOMpRL0RJJUXuTmQSBZL6U6OI6rnBjzimF3CCNcDSaqj66iruHe1xm WlvA== 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=D5jsXS7fR37ygLt1OS5QuKCEz9u9mbHIARyDzpYE5E8=; b=Ss3d6+6ikPtQr/zquheJ4asfxnUonYLEC3/vxTtDIy4IVM4lRg0zfQGW/h2eUxxAGk dmeayn0nzonjjkGnU1fl+yGPRngnpJfsaSZ0gWQKot+RsdqI/R0o8MtlvtmGBlckZxP9 WiL3npEGh/Vd2IsPuzJ+Jvb1L7UHHT5B6wxvcDEU2C39Tceof5AK2MPAdSwhwZfHaI7Z heezTADG+ngBw/J8Ux+EveVnx5sZjOe/o3I1VtSTbvCT5AdHUDns0+lrad7gPZdGEU/W wG9T8JYhD7OoZXLAfVCza7SP0dyhIRukBNfhdEQd5usKeEjcizv8zJnruJf/aXF9upvp 1VKg== X-Gm-Message-State: ABUngvcgr0mbE9IYIJsmiQUQP5Pq8AFDfaU4yCOApU5bJ4MB+r4iG0AKxV7IHTcXANpwew== X-Received: by 10.99.115.75 with SMTP id d11mr4218643pgn.56.1478866030507; Fri, 11 Nov 2016 04:07:10 -0800 (PST) Received: from localhost ([45.34.23.101]) by smtp.gmail.com with ESMTPSA id zf9sm14818557pac.12.2016.11.11.04.07.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Nov 2016 04:07:09 -0800 (PST) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig , Ming Lei , Joern Engel , Prasad Joshi , logfs@logfs.org (open list:LogFS) Subject: [PATCH 11/12] fs: logfs: use bio_add_page() in do_erase() Date: Fri, 11 Nov 2016 20:05:39 +0800 Message-Id: <1478865957-25252-12-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478865957-25252-1-git-send-email-tom.leiming@gmail.com> References: <1478865957-25252-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-Virus-Scanned: ClamAV using ClamSMTP Also code gets simplified a bit. Reviewed-by: Christoph Hellwig Signed-off-by: Ming Lei --- fs/logfs/dev_bdev.c | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) diff --git a/fs/logfs/dev_bdev.c b/fs/logfs/dev_bdev.c index a2e8511b89d6..b9188be0bf83 100644 --- a/fs/logfs/dev_bdev.c +++ b/fs/logfs/dev_bdev.c @@ -153,49 +153,35 @@ static int do_erase(struct super_block *sb, u64 ofs, pgoff_t index, size_t nr_pages) { struct logfs_super *super = logfs_super(sb); - struct bio *bio; + struct bio *bio = NULL; 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 = erase_end_io; bio_set_op_attrs(bio, REQ_OP_WRITE, 0); + } + ret = bio_add_page(bio, super->s_erase_page, PAGE_SIZE, 0); + if (!ret) { + /* Block layer cannot split bios :( */ + ofs += bio->bi_iter.bi_size; atomic_inc(&super->s_pending_writes); submit_bio(bio); - - ofs += i * PAGE_SIZE; - index += i; - nr_pages -= i; - i = 0; - - bio = bio_alloc(GFP_NOFS, max_pages); - BUG_ON(!bio); } - bio->bi_io_vec[i].bv_page = super->s_erase_page; - bio->bi_io_vec[i].bv_len = PAGE_SIZE; - bio->bi_io_vec[i].bv_offset = 0; } - 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 = erase_end_io; - bio_set_op_attrs(bio, REQ_OP_WRITE, 0); - atomic_inc(&super->s_pending_writes); - submit_bio(bio); + if (bio) { + atomic_inc(&super->s_pending_writes); + submit_bio(bio); + } return 0; }