linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ritesh Harjani <riteshh@linux.ibm.com>
To: jack@suse.cz, tytso@mit.edu, linux-ext4@vger.kernel.org
Cc: adilger.kernel@dilger.ca, linux-fsdevel@vger.kernel.org,
	darrick.wong@oracle.com, hch@infradead.org, cmaiolino@redhat.com,
	Ritesh Harjani <riteshh@linux.ibm.com>
Subject: [PATCHv3 4/6] ext4: Make ext4_ind_map_blocks work with fiemap
Date: Wed, 26 Feb 2020 15:27:06 +0530	[thread overview]
Message-ID: <56fc8d3802c578d27d49270600946a0737cef119.1582702694.git.riteshh@linux.ibm.com> (raw)
In-Reply-To: <cover.1582702693.git.riteshh@linux.ibm.com>

For indirect block mapping if the i_block > max supported block in inode
then ext4_ind_map_blocks may return a -EIO error. But in case of fiemap
this could be a valid query to ext4_map_blocks.
So in case if !create then return 0. This also makes ext4_warning to
ext4_debug in ext4_block_to_path() for the same reason.

Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
---
 fs/ext4/indirect.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index 3a4ab70fe9e0..e1ab495dd900 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -102,7 +102,11 @@ static int ext4_block_to_path(struct inode *inode,
 		offsets[n++] = i_block & (ptrs - 1);
 		final = ptrs;
 	} else {
-		ext4_warning(inode->i_sb, "block %lu > max in inode %lu",
+		/*
+		 * It's not yet an error to just query beyond max
+		 * block in inode. Fiemap callers may do so.
+		 */
+		ext4_debug("block %lu > max in inode %lu",
 			     i_block + direct_blocks +
 			     indirect_blocks + double_blocks, inode->i_ino);
 	}
@@ -537,8 +541,11 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode,
 	depth = ext4_block_to_path(inode, map->m_lblk, offsets,
 				   &blocks_to_boundary);
 
-	if (depth == 0)
+	if (depth == 0) {
+		if (!(flags & EXT4_GET_BLOCKS_CREATE))
+			err = 0;
 		goto out;
+	}
 
 	partial = ext4_get_branch(inode, depth, offsets, chain, &err);
 
-- 
2.21.0


  parent reply	other threads:[~2020-02-26  9:57 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1582702693.git.riteshh@linux.ibm.com>
2020-02-26  9:57 ` [PATCHv3 1/6] ext4: Add IOMAP_F_MERGED for non-extent based mapping Ritesh Harjani
2020-02-26 12:26   ` Jan Kara
2020-02-26 12:33     ` Ritesh Harjani
2020-02-26  9:57 ` [PATCHv3 2/6] ext4: Optimize ext4_ext_precache for 0 depth Ritesh Harjani
2020-02-26 12:28   ` Jan Kara
2020-02-26  9:57 ` [PATCHv3 3/6] ext4: Move ext4 bmap to use iomap infrastructure Ritesh Harjani
2020-02-26 12:29   ` Jan Kara
2020-02-26  9:57 ` Ritesh Harjani [this message]
2020-02-26 12:39   ` [PATCHv3 4/6] ext4: Make ext4_ind_map_blocks work with fiemap Jan Kara
2020-02-26 12:47     ` Ritesh Harjani
2020-02-26 16:11   ` Darrick J. Wong
2020-02-27  5:27     ` Ritesh Harjani
2020-02-26  9:57 ` [PATCHv3 5/6] ext4: Move ext4_fiemap to use iomap framework Ritesh Harjani
2020-02-26 13:27   ` Jan Kara
2020-02-27  5:38     ` Ritesh Harjani
2020-02-26  9:57 ` [PATCHv3 6/6] Documentation: Correct the description of FIEMAP_EXTENT_LAST Ritesh Harjani
2020-02-26 13:05   ` Matthew Wilcox
2020-02-26 16:17     ` Darrick J. Wong
2020-02-26 17:26       ` Jan Kara
2020-02-27  3:24         ` Dave Chinner
2020-02-27  5:17       ` 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=56fc8d3802c578d27d49270600946a0737cef119.1582702694.git.riteshh@linux.ibm.com \
    --to=riteshh@linux.ibm.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=cmaiolino@redhat.com \
    --cc=darrick.wong@oracle.com \
    --cc=hch@infradead.org \
    --cc=jack@suse.cz \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=tytso@mit.edu \
    /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).