All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-mm@kvack.org
Subject: Re: [PATCH 03/34] fs: move page_cache_seek_hole_data to iomap.c
Date: Tue, 29 May 2018 22:31:20 -0700	[thread overview]
Message-ID: <20180530053120.GR30110@magnolia> (raw)
In-Reply-To: <20180523144357.18985-4-hch@lst.de>

On Wed, May 23, 2018 at 04:43:26PM +0200, Christoph Hellwig wrote:
> This function is only used by the iomap code, depends on being called
> from it, and will soon stop poking into buffer head internals.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> ---
>  fs/buffer.c                 | 114 -----------------------------------
>  fs/iomap.c                  | 116 ++++++++++++++++++++++++++++++++++++
>  include/linux/buffer_head.h |   2 -
>  3 files changed, 116 insertions(+), 116 deletions(-)
> 
> diff --git a/fs/buffer.c b/fs/buffer.c
> index bd964b2ad99a..aba2a948b235 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -3430,120 +3430,6 @@ int bh_submit_read(struct buffer_head *bh)
>  }
>  EXPORT_SYMBOL(bh_submit_read);
>  
> -/*
> - * Seek for SEEK_DATA / SEEK_HOLE within @page, starting at @lastoff.
> - *
> - * Returns the offset within the file on success, and -ENOENT otherwise.
> - */
> -static loff_t
> -page_seek_hole_data(struct page *page, loff_t lastoff, int whence)
> -{
> -	loff_t offset = page_offset(page);
> -	struct buffer_head *bh, *head;
> -	bool seek_data = whence == SEEK_DATA;
> -
> -	if (lastoff < offset)
> -		lastoff = offset;
> -
> -	bh = head = page_buffers(page);
> -	do {
> -		offset += bh->b_size;
> -		if (lastoff >= offset)
> -			continue;
> -
> -		/*
> -		 * Unwritten extents that have data in the page cache covering
> -		 * them can be identified by the BH_Unwritten state flag.
> -		 * Pages with multiple buffers might have a mix of holes, data
> -		 * and unwritten extents - any buffer with valid data in it
> -		 * should have BH_Uptodate flag set on it.
> -		 */
> -
> -		if ((buffer_unwritten(bh) || buffer_uptodate(bh)) == seek_data)
> -			return lastoff;
> -
> -		lastoff = offset;
> -	} while ((bh = bh->b_this_page) != head);
> -	return -ENOENT;
> -}
> -
> -/*
> - * Seek for SEEK_DATA / SEEK_HOLE in the page cache.
> - *
> - * Within unwritten extents, the page cache determines which parts are holes
> - * and which are data: unwritten and uptodate buffer heads count as data;
> - * everything else counts as a hole.
> - *
> - * Returns the resulting offset on successs, and -ENOENT otherwise.
> - */
> -loff_t
> -page_cache_seek_hole_data(struct inode *inode, loff_t offset, loff_t length,
> -			  int whence)
> -{
> -	pgoff_t index = offset >> PAGE_SHIFT;
> -	pgoff_t end = DIV_ROUND_UP(offset + length, PAGE_SIZE);
> -	loff_t lastoff = offset;
> -	struct pagevec pvec;
> -
> -	if (length <= 0)
> -		return -ENOENT;
> -
> -	pagevec_init(&pvec);
> -
> -	do {
> -		unsigned nr_pages, i;
> -
> -		nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping, &index,
> -						end - 1);
> -		if (nr_pages == 0)
> -			break;
> -
> -		for (i = 0; i < nr_pages; i++) {
> -			struct page *page = pvec.pages[i];
> -
> -			/*
> -			 * At this point, the page may be truncated or
> -			 * invalidated (changing page->mapping to NULL), or
> -			 * even swizzled back from swapper_space to tmpfs file
> -			 * mapping.  However, page->index will not change
> -			 * because we have a reference on the page.
> -                         *
> -			 * If current page offset is beyond where we've ended,
> -			 * we've found a hole.
> -                         */
> -			if (whence == SEEK_HOLE &&
> -			    lastoff < page_offset(page))
> -				goto check_range;
> -
> -			lock_page(page);
> -			if (likely(page->mapping == inode->i_mapping) &&
> -			    page_has_buffers(page)) {
> -				lastoff = page_seek_hole_data(page, lastoff, whence);
> -				if (lastoff >= 0) {
> -					unlock_page(page);
> -					goto check_range;
> -				}
> -			}
> -			unlock_page(page);
> -			lastoff = page_offset(page) + PAGE_SIZE;
> -		}
> -		pagevec_release(&pvec);
> -	} while (index < end);
> -
> -	/* When no page at lastoff and we are not done, we found a hole. */
> -	if (whence != SEEK_HOLE)
> -		goto not_found;
> -
> -check_range:
> -	if (lastoff < offset + length)
> -		goto out;
> -not_found:
> -	lastoff = -ENOENT;
> -out:
> -	pagevec_release(&pvec);
> -	return lastoff;
> -}
> -
>  void __init buffer_init(void)
>  {
>  	unsigned long nrpages;
> diff --git a/fs/iomap.c b/fs/iomap.c
> index f2456d0d8ddd..4a01d2f4e8e9 100644
> --- a/fs/iomap.c
> +++ b/fs/iomap.c
> @@ -20,6 +20,7 @@
>  #include <linux/mm.h>
>  #include <linux/swap.h>
>  #include <linux/pagemap.h>
> +#include <linux/pagevec.h>
>  #include <linux/file.h>
>  #include <linux/uio.h>
>  #include <linux/backing-dev.h>
> @@ -588,6 +589,121 @@ int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fi,
>  }
>  EXPORT_SYMBOL_GPL(iomap_fiemap);
>  
> +/*
> + * Seek for SEEK_DATA / SEEK_HOLE within @page, starting at @lastoff.
> + *
> + * Returns the offset within the file on success, and -ENOENT otherwise.
> + */
> +static loff_t
> +page_seek_hole_data(struct page *page, loff_t lastoff, int whence)
> +{
> +	loff_t offset = page_offset(page);
> +	struct buffer_head *bh, *head;
> +	bool seek_data = whence == SEEK_DATA;
> +
> +	if (lastoff < offset)
> +		lastoff = offset;
> +
> +	bh = head = page_buffers(page);
> +	do {
> +		offset += bh->b_size;
> +		if (lastoff >= offset)
> +			continue;
> +
> +		/*
> +		 * Unwritten extents that have data in the page cache covering
> +		 * them can be identified by the BH_Unwritten state flag.
> +		 * Pages with multiple buffers might have a mix of holes, data
> +		 * and unwritten extents - any buffer with valid data in it
> +		 * should have BH_Uptodate flag set on it.
> +		 */
> +
> +		if ((buffer_unwritten(bh) || buffer_uptodate(bh)) == seek_data)
> +			return lastoff;
> +
> +		lastoff = offset;
> +	} while ((bh = bh->b_this_page) != head);
> +	return -ENOENT;
> +}
> +
> +/*
> + * Seek for SEEK_DATA / SEEK_HOLE in the page cache.
> + *
> + * Within unwritten extents, the page cache determines which parts are holes
> + * and which are data: unwritten and uptodate buffer heads count as data;
> + * everything else counts as a hole.
> + *
> + * Returns the resulting offset on successs, and -ENOENT otherwise.
> + */
> +static loff_t
> +page_cache_seek_hole_data(struct inode *inode, loff_t offset, loff_t length,
> +		int whence)
> +{
> +	pgoff_t index = offset >> PAGE_SHIFT;
> +	pgoff_t end = DIV_ROUND_UP(offset + length, PAGE_SIZE);
> +	loff_t lastoff = offset;
> +	struct pagevec pvec;
> +
> +	if (length <= 0)
> +		return -ENOENT;
> +
> +	pagevec_init(&pvec);
> +
> +	do {
> +		unsigned nr_pages, i;
> +
> +		nr_pages = pagevec_lookup_range(&pvec, inode->i_mapping, &index,
> +						end - 1);
> +		if (nr_pages == 0)
> +			break;
> +
> +		for (i = 0; i < nr_pages; i++) {
> +			struct page *page = pvec.pages[i];
> +
> +			/*
> +			 * At this point, the page may be truncated or
> +			 * invalidated (changing page->mapping to NULL), or
> +			 * even swizzled back from swapper_space to tmpfs file
> +			 * mapping.  However, page->index will not change
> +			 * because we have a reference on the page.
> +                         *
> +			 * If current page offset is beyond where we've ended,
> +			 * we've found a hole.
> +                         */
> +			if (whence == SEEK_HOLE &&
> +			    lastoff < page_offset(page))
> +				goto check_range;
> +
> +			lock_page(page);
> +			if (likely(page->mapping == inode->i_mapping) &&
> +			    page_has_buffers(page)) {
> +				lastoff = page_seek_hole_data(page, lastoff, whence);
> +				if (lastoff >= 0) {
> +					unlock_page(page);
> +					goto check_range;
> +				}
> +			}
> +			unlock_page(page);
> +			lastoff = page_offset(page) + PAGE_SIZE;
> +		}
> +		pagevec_release(&pvec);
> +	} while (index < end);
> +
> +	/* When no page at lastoff and we are not done, we found a hole. */
> +	if (whence != SEEK_HOLE)
> +		goto not_found;
> +
> +check_range:
> +	if (lastoff < offset + length)
> +		goto out;
> +not_found:
> +	lastoff = -ENOENT;
> +out:
> +	pagevec_release(&pvec);
> +	return lastoff;
> +}
> +
> +
>  static loff_t
>  iomap_seek_hole_actor(struct inode *inode, loff_t offset, loff_t length,
>  		      void *data, struct iomap *iomap)
> diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
> index 894e5d125de6..96225a77c112 100644
> --- a/include/linux/buffer_head.h
> +++ b/include/linux/buffer_head.h
> @@ -205,8 +205,6 @@ void write_boundary_block(struct block_device *bdev,
>  			sector_t bblock, unsigned blocksize);
>  int bh_uptodate_or_lock(struct buffer_head *bh);
>  int bh_submit_read(struct buffer_head *bh);
> -loff_t page_cache_seek_hole_data(struct inode *inode, loff_t offset,
> -				 loff_t length, int whence);
>  
>  extern int buffer_heads_over_limit;
>  
> -- 
> 2.17.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2018-05-30  5:31 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-23 14:43 buffered I/O without buffer heads in xfs and iomap v3 Christoph Hellwig
2018-05-23 14:43 ` [PATCH 01/34] block: add a lower-level bio_add_page interface Christoph Hellwig
2018-05-30  5:28   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 02/34] fs: factor out a __generic_write_end helper Christoph Hellwig
2018-05-30  5:30   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 03/34] fs: move page_cache_seek_hole_data to iomap.c Christoph Hellwig
2018-05-30  5:31   ` Darrick J. Wong [this message]
2018-05-23 14:43 ` [PATCH 04/34] fs: remove the buffer_unwritten check in page_seek_hole_data Christoph Hellwig
2018-05-30  5:36   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 05/34] fs: use ->is_partially_uptodate in page_cache_seek_hole_data Christoph Hellwig
2018-05-30  5:41   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 06/34] mm: give the 'ret' variable a better name __do_page_cache_readahead Christoph Hellwig
2018-05-30  5:42   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 07/34] mm: return an unsigned int from __do_page_cache_readahead Christoph Hellwig
2018-05-30  5:44   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 08/34] mm: split ->readpages calls to avoid non-contiguous pages lists Christoph Hellwig
2018-05-30  5:46   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 09/34] iomap: inline data should be an iomap type, not a flag Christoph Hellwig
2018-05-30  5:49   ` Darrick J. Wong
2018-05-30  5:49     ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 10/34] iomap: fix the comment describing IOMAP_NOWAIT Christoph Hellwig
2018-05-30  5:49   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 11/34] iomap: move IOMAP_F_BOUNDARY to gfs2 Christoph Hellwig
2018-05-30  5:50   ` Darrick J. Wong
2018-05-30  9:30     ` [Cluster-devel] " Steven Whitehouse
2018-05-30  9:59       ` Christoph Hellwig
2018-05-30 10:02         ` Steven Whitehouse
2018-05-30 10:10           ` Christoph Hellwig
2018-05-30 10:10             ` Christoph Hellwig
2018-05-30 10:10             ` Christoph Hellwig
2018-05-30 10:12             ` Steven Whitehouse
2018-05-30 11:03               ` Andreas Gruenbacher
2018-05-23 14:43 ` [PATCH 12/34] iomap: use __bio_add_page in iomap_dio_zero Christoph Hellwig
2018-05-30  5:51   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 13/34] iomap: add a iomap_sector helper Christoph Hellwig
2018-05-30  5:52   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 14/34] iomap: add an iomap-based bmap implementation Christoph Hellwig
2018-05-30  5:54   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 15/34] iomap: add an iomap-based readpage and readpages implementation Christoph Hellwig
2018-05-30  6:11   ` Darrick J. Wong
2018-05-30  6:23     ` Christoph Hellwig
2018-05-23 14:43 ` [PATCH 16/34] iomap: add initial support for writes without buffer heads Christoph Hellwig
2018-05-30  6:21   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 17/34] xfs: use iomap_bmap Christoph Hellwig
2018-05-30  6:14   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 18/34] xfs: use iomap for blocksize == PAGE_SIZE readpage and readpages Christoph Hellwig
2018-05-30  6:22   ` Darrick J. Wong
2018-05-23 14:43 ` [PATCH 19/34] xfs: simplify xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-23 16:17   ` Brian Foster
2018-05-24  8:01     ` Christoph Hellwig
2018-05-23 14:43 ` [PATCH 20/34] xfs: simplify xfs_aops_discard_page Christoph Hellwig
2018-05-23 14:43 ` [PATCH 21/34] xfs: move locking into xfs_bmap_punch_delalloc_range Christoph Hellwig
2018-05-23 14:43 ` [PATCH 22/34] xfs: make xfs_writepage_map extent map centric Christoph Hellwig
2018-05-24 14:59   ` Brian Foster
2018-05-24 16:53     ` Christoph Hellwig
2018-05-24 18:13       ` Brian Foster
2018-05-25  6:19         ` Christoph Hellwig
2018-05-25 11:35           ` Brian Foster
2018-05-28  7:15             ` Christoph Hellwig
2018-05-29 11:26               ` Brian Foster
2018-05-29 13:08                 ` Christoph Hellwig
2018-05-29 17:04                   ` Brian Foster
2018-05-23 14:43 ` [PATCH 23/34] xfs: remove the now unused XFS_BMAPI_IGSTATE flag Christoph Hellwig
2018-05-23 14:43 ` [PATCH 24/34] xfs: remove xfs_reflink_find_cow_mapping Christoph Hellwig
2018-05-23 14:43 ` [PATCH 25/34] xfs: remove xfs_reflink_trim_irec_to_next_cow Christoph Hellwig
2018-05-24 14:59   ` Brian Foster
2018-05-24 15:06     ` Brian Foster
2018-05-24 17:10       ` Christoph Hellwig
2018-05-23 14:43 ` [PATCH 26/34] xfs: simplify xfs_map_blocks by using xfs_iext_lookup_extent directly Christoph Hellwig
2018-05-23 14:43 ` [PATCH 27/34] xfs: don't clear imap_valid for a non-uptodate buffers Christoph Hellwig
2018-05-23 14:43 ` [PATCH 28/34] xfs: remove the imap_valid flag Christoph Hellwig
2018-05-23 14:43 ` [PATCH 29/34] xfs: don't look at buffer heads in xfs_add_to_ioend Christoph Hellwig
2018-05-23 14:43 ` [PATCH 30/34] xfs: move all writeback buffer_head manipulation into xfs_map_at_offset Christoph Hellwig
2018-05-23 14:43 ` [PATCH 31/34] xfs: remove xfs_start_page_writeback Christoph Hellwig
2018-05-23 14:43 ` [PATCH 32/34] xfs: refactor the tail of xfs_writepage_map Christoph Hellwig
2018-05-23 14:43 ` [PATCH 33/34] xfs: do not set the page uptodate in xfs_writepage_map Christoph Hellwig
2018-05-23 14:43 ` [PATCH 34/34] xfs: allow writeback on pages without buffer heads Christoph Hellwig
  -- strict thread matches above, loose matches on Subject: below --
2018-05-18 16:47 buffered I/O without buffer heads in xfs and iomap v2 Christoph Hellwig
2018-05-18 16:47 ` [PATCH 03/34] fs: move page_cache_seek_hole_data to iomap.c Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180530053120.GR30110@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-xfs@vger.kernel.org \
    --subject='Re: [PATCH 03/34] fs: move page_cache_seek_hole_data to iomap.c' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.