2017-08-30 14:05:23

by Dan Carpenter

[permalink] [raw]
Subject: [PATCH] kernfs: checking for IS_ERR() instead of NULL

The kernfs_get_inode() returns NULL on error, it never returns error
pointers.

Fixes: aa8188253474 ("kernfs: add exportfs operations")
Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/fs/kernfs/mount.c b/fs/kernfs/mount.c
index 7c452f4d83e9..95a7c88baed9 100644
--- a/fs/kernfs/mount.c
+++ b/fs/kernfs/mount.c
@@ -99,8 +99,8 @@ static struct inode *kernfs_fh_get_inode(struct super_block *sb,
return ERR_PTR(-ESTALE);
inode = kernfs_get_inode(sb, kn);
kernfs_put(kn);
- if (IS_ERR(inode))
- return ERR_CAST(inode);
+ if (!inode)
+ return ERR_PTR(-ESTALE);

if (generation && inode->i_generation != generation) {
/* we didn't find the right inode.. */


2017-08-31 00:39:23

by Tejun Heo

[permalink] [raw]
Subject: Re: [PATCH] kernfs: checking for IS_ERR() instead of NULL

On Wed, Aug 30, 2017 at 05:04:56PM +0300, Dan Carpenter wrote:
> The kernfs_get_inode() returns NULL on error, it never returns error
> pointers.
>
> Fixes: aa8188253474 ("kernfs: add exportfs operations")
> Signed-off-by: Dan Carpenter <[email protected]>

Acked-by: Tejun Heo <[email protected]>

Greg, can you please route this patch?

Thanks.

--
tejun

2017-08-31 16:52:45

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] kernfs: checking for IS_ERR() instead of NULL

On Wed, Aug 30, 2017 at 05:04:56PM +0300, Dan Carpenter wrote:
> The kernfs_get_inode() returns NULL on error, it never returns error
> pointers.
>
> Fixes: aa8188253474 ("kernfs: add exportfs operations")
> Signed-off-by: Dan Carpenter <[email protected]>
> Acked-by: Tejun Heo <[email protected]>

Hm, I don't know what tree aa8188253474 is in, but it's not mine, so I
can't take this patch :(

thanks,

greg k-h

2017-08-31 19:56:45

by Jens Axboe

[permalink] [raw]
Subject: Re: [PATCH] kernfs: checking for IS_ERR() instead of NULL

On 08/31/2017 10:52 AM, Greg Kroah-Hartman wrote:
> On Wed, Aug 30, 2017 at 05:04:56PM +0300, Dan Carpenter wrote:
>> The kernfs_get_inode() returns NULL on error, it never returns error
>> pointers.
>>
>> Fixes: aa8188253474 ("kernfs: add exportfs operations")
>> Signed-off-by: Dan Carpenter <[email protected]>
>> Acked-by: Tejun Heo <[email protected]>
>
> Hm, I don't know what tree aa8188253474 is in, but it's not mine, so I
> can't take this patch :(

It's in my tree, I'll take it. Can I add your
acked/reviewed/whatever-by?

--
Jens Axboe

2017-09-01 05:07:30

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH] kernfs: checking for IS_ERR() instead of NULL

On Thu, Aug 31, 2017 at 01:56:40PM -0600, Jens Axboe wrote:
> On 08/31/2017 10:52 AM, Greg Kroah-Hartman wrote:
> > On Wed, Aug 30, 2017 at 05:04:56PM +0300, Dan Carpenter wrote:
> >> The kernfs_get_inode() returns NULL on error, it never returns error
> >> pointers.
> >>
> >> Fixes: aa8188253474 ("kernfs: add exportfs operations")
> >> Signed-off-by: Dan Carpenter <[email protected]>
> >> Acked-by: Tejun Heo <[email protected]>
> >
> > Hm, I don't know what tree aa8188253474 is in, but it's not mine, so I
> > can't take this patch :(
>
> It's in my tree, I'll take it. Can I add your
> acked/reviewed/whatever-by?

Yes:

Acked-by: Greg Kroah-Hartman <[email protected]>

2017-09-01 14:19:22

by Jens Axboe

[permalink] [raw]
Subject: Re: [PATCH] kernfs: checking for IS_ERR() instead of NULL

On 08/30/2017 08:04 AM, Dan Carpenter wrote:
> The kernfs_get_inode() returns NULL on error, it never returns error
> pointers.

Added for 4.14, with the ack from Tejun and Greg.

--
Jens Axboe