Re: linux-next: manual merge of the exfat tree with Linus' tree

[Namjae Jeon <linkinjeon@kernel.org>]

2023-10-31 9:24 GMT+09:00, Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi all,
Hi Stephen,
>
> Today's linux-next merge of the exfat tree got conflicts in:
>
>   fs/exfat/inode.c
>   fs/exfat/super.c
>
> between commit:
>
>   4c72a36edd54 ("exfat: convert to new timestamp accessors")
>
> from Linus' tree and commit:
>
>   d76271feecc1 ("exfat: add ioctls for accessing attributes")
>
> from the exfat tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I will fix it after rebase.

Thanks for your report.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/exfat/inode.c
> index a2185e6f0548,edcd8a5c38d1..000000000000
> --- a/fs/exfat/inode.c
> +++ b/fs/exfat/inode.c
> @@@ -400,9 -397,9 +400,9 @@@ static int exfat_write_end(struct file
>   	if (err < len)
>   		exfat_write_failed(mapping, pos+len);
>
> - 	if (!(err < 0) && !(ei->attr & ATTR_ARCHIVE)) {
> + 	if (!(err < 0) && !(ei->attr & EXFAT_ATTR_ARCHIVE)) {
>  -		inode->i_mtime = inode_set_ctime_current(inode);
>  +		inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
> - 		ei->attr |= ATTR_ARCHIVE;
> + 		ei->attr |= EXFAT_ATTR_ARCHIVE;
>   		mark_inode_dirty(inode);
>   	}
>
> diff --cc fs/exfat/super.c
> index e919a68bf4a1,e7cba540c99e..000000000000
> --- a/fs/exfat/super.c
> +++ b/fs/exfat/super.c
> @@@ -369,9 -376,9 +376,9 @@@ static int exfat_read_root(struct inod
>   	ei->i_size_aligned = i_size_read(inode);
>   	ei->i_size_ondisk = i_size_read(inode);
>
> - 	exfat_save_attr(inode, ATTR_SUBDIR);
> + 	exfat_save_attr(inode, EXFAT_ATTR_SUBDIR);
>  -	inode->i_mtime = inode->i_atime = ei->i_crtime =
> inode_set_ctime_current(inode);
>  -	exfat_truncate_atime(&inode->i_atime);
>  +	ei->i_crtime = simple_inode_init_ts(inode);
>  +	exfat_truncate_inode_atime(inode);
>   	return 0;
>   }
>
>