From: Jan Kara <jack@suse.cz>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-ext4@vger.kernel.org, viro@zeniv.linux.org.uk,
jack@suse.cz, tytso@mit.edu, adilger@dilger.ca,
riteshh@linux.ibm.com, amir73il@gmail.com,
linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org
Subject: Re: [PATCH 03/11] ext4: split _ext4_fiemap
Date: Wed, 6 May 2020 11:22:13 +0200 [thread overview]
Message-ID: <20200506092213.GE17863@quack2.suse.cz> (raw)
In-Reply-To: <20200505154324.3226743-4-hch@lst.de>
On Tue 05-05-20 17:43:16, Christoph Hellwig wrote:
> The fiemap and EXT4_IOC_GET_ES_CACHE cases share almost no code, so split
> them into entirely separate functions.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ext4/extents.c | 72 +++++++++++++++++++++++------------------------
> 1 file changed, 35 insertions(+), 37 deletions(-)
>
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index 2b4b94542e34d..d2a2a3ba5c44a 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -4854,11 +4854,9 @@ static int ext4_fiemap_check_ranges(struct inode *inode, u64 start, u64 *len)
> return 0;
> }
>
> -static int _ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> - __u64 start, __u64 len, bool from_es_cache)
> +int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> + u64 start, u64 len)
> {
> - ext4_lblk_t start_blk;
> - u32 ext4_fiemap_flags = FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR;
> int error = 0;
>
> if (fieinfo->fi_flags & FIEMAP_FLAG_CACHE) {
> @@ -4868,10 +4866,7 @@ static int _ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> fieinfo->fi_flags &= ~FIEMAP_FLAG_CACHE;
> }
>
> - if (from_es_cache)
> - ext4_fiemap_flags &= FIEMAP_FLAG_XATTR;
> -
> - if (fiemap_check_flags(fieinfo, ext4_fiemap_flags))
> + if (fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR))
> return -EBADR;
>
> /*
> @@ -4885,40 +4880,20 @@ static int _ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
>
> if (fieinfo->fi_flags & FIEMAP_FLAG_XATTR) {
> fieinfo->fi_flags &= ~FIEMAP_FLAG_XATTR;
> - error = iomap_fiemap(inode, fieinfo, start, len,
> - &ext4_iomap_xattr_ops);
> - } else if (!from_es_cache) {
> - error = iomap_fiemap(inode, fieinfo, start, len,
> - &ext4_iomap_report_ops);
> - } else {
> - ext4_lblk_t len_blks;
> - __u64 last_blk;
> -
> - start_blk = start >> inode->i_sb->s_blocksize_bits;
> - last_blk = (start + len - 1) >> inode->i_sb->s_blocksize_bits;
> - if (last_blk >= EXT_MAX_BLOCKS)
> - last_blk = EXT_MAX_BLOCKS-1;
> - len_blks = ((ext4_lblk_t) last_blk) - start_blk + 1;
> -
> - /*
> - * Walk the extent tree gathering extent information
> - * and pushing extents back to the user.
> - */
> - error = ext4_fill_es_cache_info(inode, start_blk, len_blks,
> - fieinfo);
> + return iomap_fiemap(inode, fieinfo, start, len,
> + &ext4_iomap_xattr_ops);
> }
> - return error;
> -}
>
> -int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
> - __u64 start, __u64 len)
> -{
> - return _ext4_fiemap(inode, fieinfo, start, len, false);
> + return iomap_fiemap(inode, fieinfo, start, len, &ext4_iomap_report_ops);
> }
>
> int ext4_get_es_cache(struct inode *inode, struct fiemap_extent_info *fieinfo,
> __u64 start, __u64 len)
> {
> + ext4_lblk_t start_blk, len_blks;
> + __u64 last_blk;
> + int error = 0;
> +
> if (ext4_has_inline_data(inode)) {
> int has_inline;
>
> @@ -4929,9 +4904,32 @@ int ext4_get_es_cache(struct inode *inode, struct fiemap_extent_info *fieinfo,
> return 0;
> }
>
> - return _ext4_fiemap(inode, fieinfo, start, len, true);
> -}
> + if (fieinfo->fi_flags & FIEMAP_FLAG_CACHE) {
> + error = ext4_ext_precache(inode);
> + if (error)
> + return error;
> + fieinfo->fi_flags &= ~FIEMAP_FLAG_CACHE;
> + }
> +
> + if (fiemap_check_flags(fieinfo, FIEMAP_FLAG_SYNC))
> + return -EBADR;
>
> + error = ext4_fiemap_check_ranges(inode, start, &len);
> + if (error)
> + return error;
> +
> + start_blk = start >> inode->i_sb->s_blocksize_bits;
> + last_blk = (start + len - 1) >> inode->i_sb->s_blocksize_bits;
> + if (last_blk >= EXT_MAX_BLOCKS)
> + last_blk = EXT_MAX_BLOCKS-1;
> + len_blks = ((ext4_lblk_t) last_blk) - start_blk + 1;
> +
> + /*
> + * Walk the extent tree gathering extent information
> + * and pushing extents back to the user.
> + */
> + return ext4_fill_es_cache_info(inode, start_blk, len_blks, fieinfo);
> +}
>
> /*
> * ext4_access_path:
> --
> 2.26.2
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2020-05-06 9:22 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 15:43 fix fiemap for ext4 bitmap files (+ cleanups) v3 Christoph Hellwig
2020-05-05 15:43 ` [PATCH 01/11] ext4: fix EXT4_MAX_LOGICAL_BLOCK macro Christoph Hellwig
2020-05-05 15:43 ` [PATCH 02/11] ext4: fix fiemap size checks for bitmap files Christoph Hellwig
2020-05-06 9:18 ` Jan Kara
2020-05-05 15:43 ` [PATCH 03/11] ext4: split _ext4_fiemap Christoph Hellwig
2020-05-06 9:22 ` Jan Kara [this message]
2020-05-05 15:43 ` [PATCH 04/11] ext4: remove the call to fiemap_check_flags in ext4_fiemap Christoph Hellwig
2020-05-06 9:26 ` Jan Kara
2020-05-05 15:43 ` [PATCH 05/11] fs: mark __generic_block_fiemap static Christoph Hellwig
2020-05-06 9:27 ` Jan Kara
2020-05-05 15:43 ` [PATCH 06/11] fs: move the fiemap definitions out of fs.h Christoph Hellwig
2020-05-05 15:43 ` [PATCH 07/11] iomap: fix the iomap_fiemap prototype Christoph Hellwig
2020-05-05 15:43 ` [PATCH 08/11] fs: move fiemap range validation into the file systems instances Christoph Hellwig
2020-05-05 16:01 ` Darrick J. Wong
2020-05-06 4:16 ` Ritesh Harjani
2020-05-05 15:43 ` [PATCH 09/11] fs: handle FIEMAP_FLAG_SYNC in fiemap_prep Christoph Hellwig
2020-05-06 4:17 ` Ritesh Harjani
2020-05-05 15:43 ` [PATCH 10/11] fs: remove the access_ok() check in ioctl_fiemap Christoph Hellwig
2020-05-05 15:43 ` [PATCH 11/11] ext4: remove the access_ok() check in ext4_ioctl_get_es_cache Christoph Hellwig
2020-05-06 9:32 ` Jan Kara
2020-05-07 6:24 ` fix fiemap for ext4 bitmap files (+ cleanups) v3 Christoph Hellwig
2020-05-07 14:49 ` Theodore Y. Ts'o
2020-05-07 14:59 ` Christoph Hellwig
2020-05-19 8:04 ` Christoph Hellwig
2020-05-20 3:28 ` Theodore Y. Ts'o
2020-05-22 0:00 ` Linus Torvalds
2020-05-22 6:35 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2020-04-27 18:19 fix fiemap for ext4 bitmap files (+ cleanups) v2 Christoph Hellwig
2020-04-27 18:19 ` [PATCH 03/11] ext4: split _ext4_fiemap Christoph Hellwig
2020-05-01 23:21 ` Ritesh Harjani
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=20200506092213.GE17863@quack2.suse.cz \
--to=jack@suse.cz \
--cc=adilger@dilger.ca \
--cc=amir73il@gmail.com \
--cc=hch@lst.de \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=riteshh@linux.ibm.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).