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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 B78D3C433E0 for ; Fri, 22 Jan 2021 16:14:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5B424233FC for ; Fri, 22 Jan 2021 16:14:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B424233FC 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 E3C776B000E; Fri, 22 Jan 2021 11:14:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DED6D6B0025; Fri, 22 Jan 2021 11:14:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D032E6B0026; Fri, 22 Jan 2021 11:14:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0218.hostedemail.com [216.40.44.218]) by kanga.kvack.org (Postfix) with ESMTP id BA9896B000E for ; Fri, 22 Jan 2021 11:14:50 -0500 (EST) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 7C6DD2C1E for ; Fri, 22 Jan 2021 16:14:50 +0000 (UTC) X-FDA: 77733909540.26.use99_58065182756d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin26.hostedemail.com (Postfix) with ESMTP id 8AA55180BB967 for ; Fri, 22 Jan 2021 16:14:49 +0000 (UTC) X-HE-Tag: use99_58065182756d X-Filterd-Recvd-Size: 6404 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Fri, 22 Jan 2021 16:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=A1+HIPy+gc0pcVpTnVIkfesangqzonHz4LbQrFN5pFU=; b=T1Xkr38TmFFJMUcKHRZ0+IrU/+ EtookqUKM9mM59iDg6TlakiUy42NTTUhmddrYBUKn5gln/VxGjMVg+lott3N5Ff3+e9dCbaypvvJk rHlsuRRB0iRh4HGcE2KNLAdwJfN5wACrTQ5wZzhwwqnbef6Nqg69N38nMz5nEX7jaxXds1eO3P/Gu mbfQQGl0U9sNdMZmGgZbUMpzBAvYhVymUafFAc2sO6uvK8sVTrDoynPmAW6RI3jC/YyGUJ1MtXghN aLorOXSi3pcJKQSkkfax4obpy0f2leS5Jh+kVkp68YCrQbv45kZnybcFCdwbB0FQe9UOz6iqveQzu WbZpZekw==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1l2z41-000wkQ-RY; Fri, 22 Jan 2021 16:13:37 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: Christoph Hellwig , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox , Kent Overstreet Subject: [PATCH v5 17/18] mm/filemap: Rename generic_file_buffered_read to filemap_read Date: Fri, 22 Jan 2021 16:01:39 +0000 Message-Id: <20210122160140.223228-18-willy@infradead.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210122160140.223228-1-willy@infradead.org> References: <20210122160140.223228-1-willy@infradead.org> MIME-Version: 1.0 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: Christoph Hellwig Rename generic_file_buffered_read to match the naming of filemap_fault, also update the written parameter to a more descriptive name and improve the kerneldoc comment. Signed-off-by: Christoph Hellwig Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Kent Overstreet --- fs/btrfs/file.c | 2 +- include/linux/fs.h | 4 ++-- mm/filemap.c | 35 ++++++++++++++++------------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index d81ae1f518f23..b0ff2e62a65ca 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -3636,7 +3636,7 @@ static ssize_t btrfs_file_read_iter(struct kiocb *i= ocb, struct iov_iter *to) return ret; } =20 - return generic_file_buffered_read(iocb, to, ret); + return filemap_read(iocb, to, ret); } =20 const struct file_operations btrfs_file_operations =3D { diff --git a/include/linux/fs.h b/include/linux/fs.h index 43ba79ddbd680..11a399967ad80 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2985,8 +2985,8 @@ extern ssize_t generic_write_checks(struct kiocb *,= struct iov_iter *); extern int generic_write_check_limits(struct file *file, loff_t pos, loff_t *count); extern int generic_file_rw_checks(struct file *file_in, struct file *fil= e_out); -extern ssize_t generic_file_buffered_read(struct kiocb *iocb, - struct iov_iter *to, ssize_t already_read); +ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *to, + ssize_t already_read); extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *)= ; extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter= *); extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *= ); diff --git a/mm/filemap.c b/mm/filemap.c index 542d9c93732c2..ef910eca9e1a2 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2406,23 +2406,20 @@ static int filemap_get_pages(struct kiocb *iocb, = struct iov_iter *iter, } =20 /** - * generic_file_buffered_read - generic file read routine - * @iocb: the iocb to read - * @iter: data destination - * @written: already copied + * filemap_read - Read data from the page cache. + * @iocb: The iocb to read. + * @iter: Destination for the data. + * @already_read: Number of bytes already read by the caller. * - * This is a generic file read routine, and uses the - * mapping->a_ops->readpage() function for the actual low-level stuff. + * Copies data from the page cache. If the data is not currently presen= t, + * uses the readahead and readpage address_space operations to fetch it. * - * This is really ugly. But the goto's actually try to clarify some - * of the logic when it comes to error handling etc. - * - * Return: - * * total number of bytes copied, including those the were already @wri= tten - * * negative error code if nothing was copied + * Return: Total number of bytes copied, including those already read by + * the caller. If an error happens before any bytes are copied, returns + * a negative error number. */ -ssize_t generic_file_buffered_read(struct kiocb *iocb, - struct iov_iter *iter, ssize_t written) +ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, + ssize_t already_read) { struct file *filp =3D iocb->ki_filp; struct file_ra_state *ra =3D &filp->f_ra; @@ -2449,7 +2446,7 @@ ssize_t generic_file_buffered_read(struct kiocb *io= cb, * can no longer safely return -EIOCBQUEUED. Hence mark * an async read NOWAIT at that point. */ - if ((iocb->ki_flags & IOCB_WAITQ) && written) + if ((iocb->ki_flags & IOCB_WAITQ) && already_read) iocb->ki_flags |=3D IOCB_NOWAIT; =20 error =3D filemap_get_pages(iocb, iter, &pvec); @@ -2509,7 +2506,7 @@ ssize_t generic_file_buffered_read(struct kiocb *io= cb, =20 copied =3D copy_page_to_iter(page, offset, bytes, iter); =20 - written +=3D copied; + already_read +=3D copied; iocb->ki_pos +=3D copied; ra->prev_pos =3D iocb->ki_pos; =20 @@ -2526,9 +2523,9 @@ ssize_t generic_file_buffered_read(struct kiocb *io= cb, =20 file_accessed(filp); =20 - return written ? written : error; + return already_read ? already_read : error; } -EXPORT_SYMBOL_GPL(generic_file_buffered_read); +EXPORT_SYMBOL_GPL(filemap_read); =20 /** * generic_file_read_iter - generic filesystem read routine @@ -2603,7 +2600,7 @@ generic_file_read_iter(struct kiocb *iocb, struct i= ov_iter *iter) goto out; } =20 - retval =3D generic_file_buffered_read(iocb, iter, retval); + retval =3D filemap_read(iocb, iter, retval); out: return retval; } --=20 2.29.2