Subject: [merged] ocfs2-refcounttree-add-the-missing-null-check-of-the-return-value-of-find_or_create_page.patch removed from -mm tree
To: guz.fnst@xxxxxxxxxxxxxx,jlbec@xxxxxxxxxxxx,mfasheh@xxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 05 Aug 2013 12:05:39 -0700
The patch titled
Subject: ocfs2/refcounttree: add the missing NULL check of the return value of find_or_create_page()
has been removed from the -mm tree. Its filename was
ocfs2-refcounttree-add-the-missing-null-check-of-the-return-value-of-find_or_create_page.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Gu Zheng <guz.fnst@xxxxxxxxxxxxxx>
Subject: 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().
[akpm@xxxxxxxxxxxxxxxxxxxx: fix layout, per Joel]
Signed-off-by: Gu Zheng <guz.fnst@xxxxxxxxxxxxxx>
Acked-by: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/refcounttree.c | 5 +++++
1 file changed, 5 insertions(+)
diff -puN fs/ocfs2/refcounttree.c~ocfs2-refcounttree-add-the-missing-null-check-of-the-return-value-of-find_or_create_page fs/ocfs2/refcounttree.c
--- a/fs/ocfs2/refcounttree.c~ocfs2-refcounttree-add-the-missing-null-check-of-the-return-value-of-find_or_create_page
+++ a/fs/ocfs2/refcounttree.c
@@ -2965,6 +2965,11 @@ int ocfs2_duplicate_clusters_by_page(han
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
_
Patches currently in -mm which might be from guz.fnst@xxxxxxxxxxxxxx are
lib-crc32-update-the-comments-of-crc32_bele_generic.patch
lib-crc32-update-the-comments-of-crc32_bele_generic-checkpatch-fixes.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
