On Fri, May 02, 2014 at 01:27:01PM +0200, Lukáš Czerner wrote:
> On Thu, 1 May 2014, Darrick J. Wong wrote:
>
> > Date: Thu, 01 May 2014 16:12:49 -0700
> > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> > To: tytso@xxxxxxx, darrick.wong@xxxxxxxxxx
> > Cc: linux-ext4@xxxxxxxxxxxxxxx
> > Subject: [PATCH 04/37] mke2fs: always warn if 128-byte inode and inline_data
> >
> > The combination of 128-byte inodes and inline_data is silly, since
> > there's no room in the inode table. Unfortunately, if neither
> > mke2fs.conf nor the mkfs command line options specify an inode size,
> > the default inode size is set to 128 bytes (by libext2fs) and the
> > warning isn't printed. Therefore, always do the check-and-warning.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> > ---
> > misc/mke2fs.c | 25 +++++++++++++------------
> > 1 file changed, 13 insertions(+), 12 deletions(-)
> >
> >
> > diff --git a/misc/mke2fs.c b/misc/mke2fs.c
> > index aecd5d5..6507d0d 100644
> > --- a/misc/mke2fs.c
> > +++ b/misc/mke2fs.c
> > @@ -2282,21 +2282,22 @@ profile_error:
> > blocksize);
> > exit(1);
> > }
> > - /*
> > - * If inode size is 128 and inline data is enabled, we need
> > - * to notify users that inline data will never be useful.
> > - */
> > - if ((fs_param.s_feature_incompat &
> > - EXT4_FEATURE_INCOMPAT_INLINE_DATA) &&
> > - inode_size == EXT2_GOOD_OLD_INODE_SIZE) {
> > - com_err(program_name, 0,
> > - _("inode size is %d, inline data is useless"),
> > - inode_size);
> > - exit(1);
> > - }
> > fs_param.s_inode_size = inode_size;
> > }
> >
> > + /*
> > + * If inode size is 128 and inline data is enabled, we need
> > + * to notify users that inline data will never be useful.
> > + */
> > + if ((fs_param.s_feature_incompat &
> > + EXT4_FEATURE_INCOMPAT_INLINE_DATA) &&
> > + fs_param.s_inode_size == EXT2_GOOD_OLD_INODE_SIZE) {
> > + com_err(program_name, 0,
> > + _("inode size is %d, inline data is useless"),
> > + inode_size);
>
> Oops :) copy-paste is tricky. You need to use fs_param.s_inode_size
> rather than inode_size here. Otherwise it looks good.
Will fix, thanks.
--D
>
> Thanks!
> -Lukas
>
>
> > + exit(1);
> > + }
> > +
> > /* Make sure number of inodes specified will fit in 32 bits */
> > if (num_inodes == 0) {
> > unsigned long long n;
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
