On Thu, May 6, 2021 at 7:33 AM Ilya Dryomov <idryomov@xxxxxxxxx> wrote:
>
> There is a merge conflict in fs/ceph/dir.c because Jeff's inode
> type handling patch went through the vfs tree together with Al's
> inode_wrong_type() helper. for-linus-merged has the resolution.
Actually, the linux-next resolution looks wrong - or at least
unnecessary - to me.
The conversion to d_splice_alias() means that the IS_ERR() test is now
pointless, because d_splice_alias() handles an error-pointer natively,
and just returns the error back with ERR_CAST().
So the proper resolution seems to be to just drop the IS_ERR().
Adding Jeff and Al just as a heads-up.
Linus
