From patchwork Thu May 31 18:06:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 10441689 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 37B02602BC for ; Thu, 31 May 2018 18:06:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2571A28F91 for ; Thu, 31 May 2018 18:06:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A6D428FA8; Thu, 31 May 2018 18:06:56 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEBD328F91 for ; Thu, 31 May 2018 18:06:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5DB9D6B026D; Thu, 31 May 2018 14:06:47 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 55FF96B026E; Thu, 31 May 2018 14:06:47 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B4496B026F; Thu, 31 May 2018 14:06:47 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id E646C6B026D for ; Thu, 31 May 2018 14:06:46 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id b31-v6so13743374plb.5 for ; Thu, 31 May 2018 11:06:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=NcqDkZVy+WeZbgl3NGgohbOk1ZGlRx3vUsAh2lpGXLA=; b=U0oDiNSU2YbnqR7H5ENs8bOMKOKHHntn3AUulHx5zJkfYg4DQqfX6pp2f2w9pkX5iX pToIDf0nWZx4ICNeKJJxlTx9amYB3YtOsReRI0bbBgu8/C24Ts7rqi8fmEFyUrDqz4aB 0OPMY0CuYNJix/qHinKFyGmrp5u5x94+3HGnAkJD5hHiRNKNmG01hv7bX6nCcoSNBhxl pplraDb0YHM6jT9RKPFHz6BmTBTUDSWKw6pDHXH3j789/z9h+fGdG7R3hKv05qZdt5FA wFEgqoH/5DbYeSABsYAjtiweE4zy0Or7DFInuQjPugI5BKZ6+JzGekec6MUwRAMFOBIU 6jbQ== X-Gm-Message-State: ALKqPweEKLdGgZvvR5nJPQkuSdMOaJg865bZuCYZvfQXw4kbq+qExWt0 PQXlnUo+SsKvVuXYQCWodd7dQXfSgVz05spp5FZYmOLhrhXs6LBEMiyUlkHOW9BF+58gG6sLxAb axYDOAQQaB0pf+qAussqBujzVdppd74UWJ+ip66LGfHVRzA06WHMvnLjLEZElxdo= X-Received: by 2002:a62:190f:: with SMTP id 15-v6mr7770849pfz.42.1527790006638; Thu, 31 May 2018 11:06:46 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLf2sor6p7chHLtg7wmKFEjEmLYuM/Cv/Tetlpf5O+mwHTkN1S/VvPB3TABJOZ3tWeCpMSv X-Received: by 2002:a62:190f:: with SMTP id 15-v6mr7770804pfz.42.1527790005705; Thu, 31 May 2018 11:06:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527790005; cv=none; d=google.com; s=arc-20160816; b=y4IhOFJ2KErBPh/mtm0YZUw5Bp0pOmdt2MdOERVrlMQG0PLg1YQcOA9uBQgQJSBQXl r7Z1c1WtfKu9lKs8Dz/U22eG7uOJo7zvo/kE6AxjOeOl5Gu9nPgg+Jc5D2vgYOuOI97P 2dpKshnTkknlhjFGcg9134J0TqKywr7AMdkFZagq+BygLWyCztYYlnJICsWmz7lnH1OB mawss8LQYQmnOYmdVyx9v2febw4pGyT7K16j1xl2s8c4Rl1sdVPjJaLJMJe/1hb4+LK5 Yv/+azXK7s6kQgdahTT+ZAH2SLWWbWdFZM1ntCyoUl/fAKTm3AzgzgLkZ+unlJ+/ujIi TmBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=NcqDkZVy+WeZbgl3NGgohbOk1ZGlRx3vUsAh2lpGXLA=; b=Xg97nYKPhTFM7HUsHa7jTZpxi3ts9pJczYNgMKIOqngWj/f8RYdLTKUkqOHDOMsx2r s9mVuaJu/dRA+Sxl4MgNGNk158utrNGUQiDmx5qgesWjp89QNg7Wbj1RD3JWzveNtGqB VpOS60gV3MxRMQI7v3u6ud/uaIkCc//55ykgwKSyNNbwBbvDWOXgwvGTxqNRmknJQf+N zakL6w63iktO92irgwPiNImIuDUeZN6rugSdzAFD9oyi9uFACwJeTPGa/1hnRnS+HaUD WnNOBWaJLmXtREAt8vfzXMtlL1MvlSM9Im++LhsAl0JvfF+fpJGmIX3gOCWUINkuBhxz CAcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=GjF8p2WD; spf=pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id 7-v6si37479688plc.179.2018.05.31.11.06.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 May 2018 11:06:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=GjF8p2WD; spf=pass (google.com: best guess record for domain of batv+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=BATV+67dfbb8f664e29ec4bbc+5394+infradead.org+hch@bombadil.srs.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=NcqDkZVy+WeZbgl3NGgohbOk1ZGlRx3vUsAh2lpGXLA=; b=GjF8p2WDKeqGC/pJzDOeO2Jn4 eYzVwpJ6/5K/qEYgU0niu5ehT0Yuw8ANcdbbuvB1fr3mqZ30KhF2xbsJT+fZ+Gp9NYiMlg+KWIsLh GxhISkiOhy8fvvcnpFhzzoPBo2UC+rHJBJgr4FuumfIhqihwXuts6dOQMfVxq4ZhvjobkKRZM3Awb 5Lj/0pNkTbOBrMHDhoSjofO9PanVr1zJDP6EgdMWsXOW2oFr3PgwpoOg9uciK1fm1Bwtjd0GzFNYV V7B8BEOXrIcsY7mPsr3UOlN7D9YTW+h0BTdlinPF4MAAliOqhbCskTM1LQr+ekN0NZRiKM8Ur3WB3 wAkslT7wg==; Received: from 213-225-38-123.nat.highway.a1.net ([213.225.38.123] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fORyG-0003Ou-Me; Thu, 31 May 2018 18:06:45 +0000 From: Christoph Hellwig To: linux-xfs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 08/13] iomap: use __bio_add_page in iomap_dio_zero Date: Thu, 31 May 2018 20:06:09 +0200 Message-Id: <20180531180614.21506-9-hch@lst.de> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180531180614.21506-1-hch@lst.de> References: <20180531180614.21506-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP We don't need any merging logic, and this also replaces a BUG_ON with a WARN_ON_ONCE inside __bio_add_page for the impossible overflow condition. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Darrick J. Wong --- fs/iomap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/iomap.c b/fs/iomap.c index df2652b0d85d..85901b449146 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -845,8 +845,7 @@ iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos, bio->bi_end_io = iomap_dio_bio_end_io; get_page(page); - if (bio_add_page(bio, page, len, 0) != len) - BUG(); + __bio_add_page(bio, page, len, 0); bio_set_op_attrs(bio, REQ_OP_WRITE, REQ_SYNC | REQ_IDLE); atomic_inc(&dio->ref);