linux-kernel - Re: [GIT PULL] Ceph updates for 5.13-rc1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wgjQgUYrMD_tTm5M1BqeN5Z7h_z5EkU65RXAnEevsTDLA@mail.gmail.com>
Date:   Thu, 6 May 2021 10:51:33 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Ilya Dryomov <idryomov@...il.com>,
        Jeff Layton <jlayton@...nel.org>,
        Al Viro <viro@...iv.linux.org.uk>
Cc:     ceph-devel@...r.kernel.org,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] Ceph updates for 5.13-rc1

On Thu, May 6, 2021 at 7:33 AM Ilya Dryomov <idryomov@...il.com> 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