[patch] f2fs: alloc_page() doesn't return an ERR_PTR

[patch] f2fs: alloc_page() doesn't return an ERR_PTR

[Dan Carpenter]

alloc_page() returns a NULL on failure, it never returns an ERR_PTR.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index f5172e2..3e87fe0 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1515,8 +1515,8 @@ int restore_node_summary(struct f2fs_sb_info *sbi,
 
 	/* alloc temporal page for read node */
 	page = alloc_page(GFP_NOFS | __GFP_ZERO);
-	if (IS_ERR(page))
-		return PTR_ERR(page);
+	if (!page)
+		return -ENOMEM;
 	lock_page(page);
 
 	/* scan the node segment */

------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk

Re: [patch] f2fs: alloc_page() doesn't return an ERR_PTR

[Jaegeuk Kim]

Hi Dan,

Agreed.
Could you make a patch that covers other alloc_page cases too?

# grep alloc_page fs/f2fs/*
fs/f2fs/node.c:	page = alloc_page(GFP_NOFS | __GFP_ZERO);
fs/f2fs/recovery.c: page = alloc_page(GFP_F2FS_ZERO);
fs/f2fs/recovery.c: page = alloc_page(GFP_NOFS | __GFP_ZERO);

Thank you,

2013-08-14 (수), 14:41 +0300, Dan Carpenter:
> alloc_page() returns a NULL on failure, it never returns an ERR_PTR.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
> index f5172e2..3e87fe0 100644
> --- a/fs/f2fs/node.c
> +++ b/fs/f2fs/node.c
> @@ -1515,8 +1515,8 @@ int restore_node_summary(struct f2fs_sb_info *sbi,
>  
>  	/* alloc temporal page for read node */
>  	page = alloc_page(GFP_NOFS | __GFP_ZERO);
> -	if (IS_ERR(page))
> -		return PTR_ERR(page);
> +	if (!page)
> +		return -ENOMEM;
>  	lock_page(page);
>  
>  	/* scan the node segment */

-- 
Jaegeuk Kim
Samsung

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch] f2fs: alloc_page() doesn't return an ERR_PTR

[Dan Carpenter]

On Wed, Aug 14, 2013 at 10:24:36PM +0900, Jaegeuk Kim wrote:
> Hi Dan,
> 
> Agreed.
> Could you make a patch that covers other alloc_page cases too?

Sure.  Thanks for catching that.  I will resend a v2 of this one
which fixes those as well.

regards,
dan carpenter

[patch v2] f2fs: alloc_page() doesn't return an ERR_PTR

[Dan Carpenter]

alloc_page() returns a NULL on failure, it never returns an ERR_PTR.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: fix the calls in recovery.c as well.

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index f5172e2..3e87fe0 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1515,8 +1515,8 @@ int restore_node_summary(struct f2fs_sb_info *sbi,
 
 	/* alloc temporal page for read node */
 	page = alloc_page(GFP_NOFS | __GFP_ZERO);
-	if (IS_ERR(page))
-		return PTR_ERR(page);
+	if (!page)
+		return -ENOMEM;
 	lock_page(page);
 
 	/* scan the node segment */
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 639eb34..889b4bd 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -129,8 +129,8 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head)
 
 	/* read node page */
 	page = alloc_page(GFP_F2FS_ZERO);
-	if (IS_ERR(page))
-		return PTR_ERR(page);
+	if (!page)
+		return -ENOMEM;
 	lock_page(page);
 
 	while (1) {
@@ -367,7 +367,7 @@ static int recover_data(struct f2fs_sb_info *sbi,
 
 	/* read node page */
 	page = alloc_page(GFP_NOFS | __GFP_ZERO);
-	if (IS_ERR(page))
+	if (!page)
 		return -ENOMEM;
 
 	lock_page(page);


------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk