Ocfs2 devel - Jul 2013 - [PATCH] ocfs2/refcounttree: add the missing NULL check of the return value of find_or_create_page()

Add the missing NULL check of the return value of find_or_create_page() in
function ocfs2_duplicate_clusters_by_page().

Signed-off-by: Gu Zheng <guz.fnst at cn.fujitsu.com>
---
 fs/ocfs2/refcounttree.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index 998b17e..456d0e4 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -2965,7 +2965,11 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,
 			to = map_end & (PAGE_CACHE_SIZE - 1);

 		page = find_or_create_page(mapping, page_index, GFP_NOFS);
-
+		if (!page) {
+			ret = -ENOMEM;
+			mlog_errno(ret);
+			break;
+		}
 		/*
 		 * In case PAGE_CACHE_SIZE <= CLUSTER_SIZE, This page
 		 * can't be dirtied before we CoW it out.
-- 
1.7.7

On Mon, Jul 08, 2013 at 03:52:53PM +0800, Gu Zheng
wrote:
> Add the missing NULL check of the return value of find_or_create_page() in
> function ocfs2_duplicate_clusters_by_page().
> 
> Signed-off-by: Gu Zheng <guz.fnst at cn.fujitsu.com>
> ---
>  fs/ocfs2/refcounttree.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
> index 998b17e..456d0e4 100644
> --- a/fs/ocfs2/refcounttree.c
> +++ b/fs/ocfs2/refcounttree.c
> @@ -2965,7 +2965,11 @@ int ocfs2_duplicate_clusters_by_page(handle_t
*handle,
>  			to = map_end & (PAGE_CACHE_SIZE - 1);
> 
>  		page = find_or_create_page(mapping, page_index, GFP_NOFS);
> -
> +		if (!page) {
> +			ret = -ENOMEM;
> +			mlog_errno(ret);
> +			break;
> +		}
>  		/*
>  		 * In case PAGE_CACHE_SIZE <= CLUSTER_SIZE, This page
>  		 * can't be dirtied before we CoW it out.
Put a blank line between the closing brace and the comment.  Otherwise,
Acked-by: Joel Becker <jlbec at evilplan.org>

Joel
> -- 
> 1.7.7
> 
> --
> To unsubscribe from this list: send the line "unsubscribe
linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
-- 

Life's Little Instruction Book #99

	"Think big thoughts, but relish small pleasures."

			http://www.jlbec.org/
			jlbec at evilplan.org