From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1416C433E0 for ; Wed, 10 Jun 2020 20:39:19 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 65D82206A4 for ; Wed, 10 Jun 2020 20:39:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="tXkviFNu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65D82206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A03848D0020; Wed, 10 Jun 2020 16:39:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 963DB8D000E; Wed, 10 Jun 2020 16:39:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 806EA8D0020; Wed, 10 Jun 2020 16:39:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0002.hostedemail.com [216.40.44.2]) by kanga.kvack.org (Postfix) with ESMTP id 4F86A8D000E for ; Wed, 10 Jun 2020 16:39:16 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 04B85180AEF50 for ; Wed, 10 Jun 2020 20:39:15 +0000 (UTC) X-FDA: 76914467112.20.rice69_431804d26dce Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id C8FD8182152FD for ; Wed, 10 Jun 2020 20:39:15 +0000 (UTC) X-HE-Tag: rice69_431804d26dce X-Filterd-Recvd-Size: 4543 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Wed, 10 Jun 2020 20:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=ugHC/UWmtHSn08iaOdB7fIiqwpchGhJFCvJwrf5/iGA=; b=tXkviFNu+Ol6AvIwDGb5N/BYqR L3m7YF30nlbbilanZVQIxQL3uS7W7tJ2Q6Q+VyoYnn4XWazp6KLwgwx/1zqEA67tMOi1ADizS6rJD l1jYAbsLPda4V48o/1J1XPeGDJDCOSYU78zkUudhBlIvknxNpDvBlxVhSR8bOuBYQ2L96A85SG1+0 dSn6PpzrCu1rlIkwOFWeUVrfe/IOCkaIZyGnChgSM1BBxcvEAZb6MK+0Rqi7CItepKhmhVJI+ZFnd WuJ8eb95wBSyAD/7B1IK0kXQiPO/HDGv/kPjsNooACZ8DrlYWq5seVxIf/ts5ArNm53muftkM0iYd hom2gr1w==; Received: from willy by bombadil.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1jj76a-0003Vc-8x; Wed, 10 Jun 2020 20:13:48 +0000 From: Matthew Wilcox To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 26/51] iomap: Convert iomap_write_end types Date: Wed, 10 Jun 2020 13:13:20 -0700 Message-Id: <20200610201345.13273-27-willy@infradead.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200610201345.13273-1-willy@infradead.org> References: <20200610201345.13273-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: C8FD8182152FD X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable 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: From: "Matthew Wilcox (Oracle)" iomap_write_end cannot return an error, so switch it to return size_t instead of int and remove the error checking from the callers. Also convert the arguments to size_t from unsigned int, in case anyone ever wants to support a page size larger than 2GB. Signed-off-by: Matthew Wilcox (Oracle) --- fs/iomap/buffered-io.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 555ec90e8b54..fffdf5906e99 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -692,9 +692,8 @@ iomap_set_page_dirty(struct page *page) } EXPORT_SYMBOL_GPL(iomap_set_page_dirty); =20 -static int -__iomap_write_end(struct inode *inode, loff_t pos, unsigned len, - unsigned copied, struct page *page) +static size_t __iomap_write_end(struct inode *inode, loff_t pos, size_t = len, + size_t copied, struct page *page) { flush_dcache_page(page); =20 @@ -716,9 +715,8 @@ __iomap_write_end(struct inode *inode, loff_t pos, un= signed len, return copied; } =20 -static int -iomap_write_end_inline(struct inode *inode, struct page *page, - struct iomap *iomap, loff_t pos, unsigned copied) +static size_t iomap_write_end_inline(struct inode *inode, struct page *p= age, + struct iomap *iomap, loff_t pos, size_t copied) { void *addr; =20 @@ -733,13 +731,14 @@ iomap_write_end_inline(struct inode *inode, struct = page *page, return copied; } =20 -static int -iomap_write_end(struct inode *inode, loff_t pos, unsigned len, unsigned = copied, - struct page *page, struct iomap *iomap, struct iomap *srcmap) +/* Returns the number of bytes copied. May be 0. Cannot be an errno. *= / +static size_t iomap_write_end(struct inode *inode, loff_t pos, size_t le= n, + size_t copied, struct page *page, struct iomap *iomap, + struct iomap *srcmap) { const struct iomap_page_ops *page_ops =3D iomap->page_ops; loff_t old_size =3D inode->i_size; - int ret; + size_t ret; =20 if (srcmap->type =3D=3D IOMAP_INLINE) { ret =3D iomap_write_end_inline(inode, page, iomap, pos, copied); @@ -820,11 +819,8 @@ iomap_write_actor(struct inode *inode, loff_t pos, l= off_t length, void *data, =20 flush_dcache_page(page); =20 - status =3D iomap_write_end(inode, pos, bytes, copied, page, iomap, + copied =3D iomap_write_end(inode, pos, bytes, copied, page, iomap, srcmap); - if (unlikely(status < 0)) - break; - copied =3D status; =20 cond_resched(); =20 @@ -898,11 +894,8 @@ iomap_unshare_actor(struct inode *inode, loff_t pos,= loff_t length, void *data, =20 status =3D iomap_write_end(inode, pos, bytes, bytes, page, iomap, srcmap); - if (unlikely(status <=3D 0)) { - if (WARN_ON_ONCE(status =3D=3D 0)) - return -EIO; - return status; - } + if (WARN_ON_ONCE(status =3D=3D 0)) + return -EIO; =20 cond_resched(); =20 --=20 2.26.2