On Thu, 2023-07-06 at 14:36 +0200, Jan Kara wrote:
> On Wed 05-07-23 15:01:07, Jeff Layton wrote:
> > In later patches, we're going to change how the inode's ctime field is
> > used. Switch to using accessor functions instead of raw accesses of
> > inode->i_ctime.
> >
> > Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
>
> Some comment below:
>
> > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> > index 0a2d55faa095..d502b930431b 100644
> > --- a/fs/ext4/ext4.h
> > +++ b/fs/ext4/ext4.h
> > @@ -3823,6 +3823,27 @@ static inline int ext4_buffer_uptodate(struct buffer_head *bh)
> > return buffer_uptodate(bh);
> > }
> >
> > +static inline void ext4_inode_set_ctime(struct inode *inode, struct ext4_inode *raw_inode)
> > +{
> > + struct timespec64 ctime = inode_get_ctime(inode);
> > +
> > + if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), i_ctime_extra)) {
> > + raw_inode->i_ctime = cpu_to_le32(ctime.tv_sec);
> > + raw_inode->i_ctime_extra = ext4_encode_extra_time(&ctime);
> > + } else {
> > + raw_inode->i_ctime = cpu_to_le32(clamp_t(int32_t, ctime.tv_sec, S32_MIN, S32_MAX));
> > + }
> > +}
> > +
> > +static inline void ext4_inode_get_ctime(struct inode *inode, const struct ext4_inode *raw_inode)
> > +{
> > + struct timespec64 ctime = { .tv_sec = (signed)le32_to_cpu(raw_inode->i_ctime) };
> > +
> > + if (EXT4_FITS_IN_INODE(raw_inode, EXT4_I(inode), i_ctime_extra))
> > + ext4_decode_extra_time(&ctime, raw_inode->i_ctime_extra);
> > + inode_set_ctime(inode, ctime.tv_sec, ctime.tv_nsec);
> > +}
> > +
>
> This duplication is kind of unpleasant. I was looking into it for a while
> and I think we can rather do some initial cleanup (attached patch 1) and
> then your conversion patch would not need to duplicate the conversion code
> (see attached patch 2).
>
>
>
Thanks Jan. That looks fine at first glance. I'll plan to drop my ext4
patch and replace it with these.
Cheers,
--
Jeff Layton <jlayton@xxxxxxxxxx>
