diff mbox

kernfs: checking for IS_ERR() instead of NULL

Message ID 20170830140456.7n6sfogqb7mvjmrm@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Aug. 30, 2017, 2:04 p.m. UTC 
The kernfs_get_inode() returns NULL on error, it never returns error
pointers.

Fixes: aa8188253474 ("kernfs: add exportfs operations")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Tejun Heo Aug. 31, 2017, 12:39 a.m. UTC | #1 
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 <dan.carpenter@oracle.com>

Acked-by: Tejun Heo <tj@kernel.org>

Greg, can you please route this patch?

Thanks.
Greg Kroah-Hartman Aug. 31, 2017, 4:52 p.m. UTC | #2 
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 <dan.carpenter@oracle.com>
> Acked-by: Tejun Heo <tj@kernel.org>

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
Jens Axboe Aug. 31, 2017, 7:56 p.m. UTC | #3 
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 <dan.carpenter@oracle.com>
>> Acked-by: Tejun Heo <tj@kernel.org>
> 
> 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?
Greg Kroah-Hartman Sept. 1, 2017, 5:07 a.m. UTC | #4 
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 <dan.carpenter@oracle.com>
> >> Acked-by: Tejun Heo <tj@kernel.org>
> > 
> > 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 <gregkh@linuxfoundation.org>
Jens Axboe Sept. 1, 2017, 2:19 p.m. UTC | #5 
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.
diff mbox

Patch

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.. */