From: Jan Kara <jack@suse.cz>
To: "Theodore Y. Ts'o" <tytso@mit.edu>
Cc: Jan Kara <jack@suse.cz>, linux-ext4@vger.kernel.org
Subject: Re: [PATCH 2/7] e2fsck: Fix indexed dir rehash failure with metadata_csum enabled
Date: Mon, 16 Mar 2020 10:30:48 +0100 [thread overview]
Message-ID: <20200316093048.GD12783@quack2.suse.cz> (raw)
In-Reply-To: <20200307231719.GE99899@mit.edu>
On Sat 07-03-20 18:17:19, Theodore Y. Ts'o wrote:
> On Thu, Feb 13, 2020 at 11:15:57AM +0100, Jan Kara wrote:
> > E2fsck directory rehashing code can fail with ENOSPC due to a bug in
> > ext2fs_htree_intnode_maxrecs() which fails to take metadata checksum
> > into account and thus e.g. e2fsck can decide to create 1 indirect level
> > of index tree when two are actually needed. Fix the logic to account for
> > metadata checksum.
> >
> > Signed-off-by: Jan Kara <jack@suse.cz>
>
> Applied with a minor change; I didn't want to make this change:
>
> > -_INLINE_ int ext2fs_htree_intnode_maxrecs(ext2_filsys fs, int blocks)
> > +static inline int ext2fs_htree_intnode_maxrecs(ext2_filsys fs, int blocks)
>
> ... because it would make ext2fs_htree_intmode_maxrecs disappear from
> libext2fs.so.
Aha! I was wondering what's going on with those strange inline
statements...
> So I changed this:
>
> > + if (ext2fs_has_feature_metadata_csum(fs->super))
>
> to this:
>
> + if ((EXT2_SB(fs->super)->s_feature_ro_compat &
> + EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) != 0)
>
> to fix the inline related compilation errors.
Thanks for fixing this!
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2020-03-16 9:30 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-13 10:15 [PATCH 0/7 v2] e2fsprogs: Better handling of indexed directories Jan Kara
2020-02-13 10:15 ` [PATCH 1/7] e2fsck: Clarify overflow link count error message Jan Kara
2020-02-14 19:27 ` Andreas Dilger
2020-03-07 18:52 ` Theodore Y. Ts'o
2020-02-13 10:15 ` [PATCH 2/7] e2fsck: Fix indexed dir rehash failure with metadata_csum enabled Jan Kara
2020-02-14 19:28 ` Andreas Dilger
2020-03-07 23:17 ` Theodore Y. Ts'o
2020-03-16 9:30 ` Jan Kara [this message]
2020-02-13 10:15 ` [PATCH 3/7] ext2fs: Update allocation info earlier in ext2fs_mkdir() and ext2fs_symlink() Jan Kara
2020-02-14 19:37 ` Andreas Dilger
2020-03-08 0:02 ` Theodore Y. Ts'o
2020-03-08 2:20 ` Theodore Y. Ts'o
2020-03-15 16:15 ` Theodore Y. Ts'o
2020-03-16 9:32 ` Jan Kara
2020-02-13 10:15 ` [PATCH 4/7] ext2fs: Implement dir entry creation in htree directories Jan Kara
2020-03-15 16:43 ` Theodore Y. Ts'o
2020-02-13 10:16 ` [PATCH 5/7] tests: Modify f_large_dir test to excercise indexed dir handling Jan Kara
2020-02-18 20:29 ` Andreas Dilger
2020-03-15 16:43 ` Theodore Y. Ts'o
2020-02-13 10:16 ` [PATCH 6/7] tests: Add test to excercise indexed directories with metadata_csum Jan Kara
2020-02-18 20:34 ` Andreas Dilger
2020-02-13 10:16 ` [PATCH 7/7] tune2fs: Update dir checksums when clearing dir_index feature Jan Kara
2020-02-18 20:50 ` Andreas Dilger
2020-02-19 10:23 ` Jan Kara
2020-03-15 17:15 ` Theodore Y. Ts'o
2020-03-16 0:11 ` Andreas Dilger
2020-03-16 9:27 ` Jan Kara
2020-03-26 14:27 ` Jan Kara
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=20200316093048.GD12783@quack2.suse.cz \
--to=jack@suse.cz \
--cc=linux-ext4@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).