[Ocfs2-commits] mfasheh commits r2841 - branches/ocfs2-1.2/fs/ocfs2

[svn-commits@oss.oracle.com]

Author: mfasheh
Signed-off-by: jlbec
Date: 2006-04-12 16:53:40 -0500 (Wed, 12 Apr 2006)
New Revision: 2841

Modified:
   branches/ocfs2-1.2/fs/ocfs2/extent_map.c
   branches/ocfs2-1.2/fs/ocfs2/journal.c
   branches/ocfs2-1.2/fs/ocfs2/uptodate.c
   branches/ocfs2-1.2/fs/ocfs2/vote.c
Log:
We were using GFP_KERNEL in a handful of places which really wanted
GFP_NOFS. Fix this.

Signed-off-by: jlbec


Modified: branches/ocfs2-1.2/fs/ocfs2/extent_map.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/extent_map.c	2006-04-12 21:49:53 UTC (rev 2840)
+++ branches/ocfs2-1.2/fs/ocfs2/extent_map.c	2006-04-12 21:53:40 UTC (rev 2841)
@@ -581,7 +581,7 @@
 
 	ret = -ENOMEM;
 	ctxt.new_ent = kmem_cache_alloc(ocfs2_em_ent_cachep,
-					GFP_KERNEL);
+					GFP_NOFS);
 	if (!ctxt.new_ent) {
 		mlog_errno(ret);
 		return ret;
@@ -595,14 +595,14 @@
 		if (ctxt.need_left && !ctxt.left_ent) {
 			ctxt.left_ent =
 				kmem_cache_alloc(ocfs2_em_ent_cachep,
-						 GFP_KERNEL);
+						 GFP_NOFS);
 			if (!ctxt.left_ent)
 				break;
 		}
 		if (ctxt.need_right && !ctxt.right_ent) {
 			ctxt.right_ent =
 				kmem_cache_alloc(ocfs2_em_ent_cachep,
-						 GFP_KERNEL);
+						 GFP_NOFS);
 			if (!ctxt.right_ent)
 				break;
 		}

Modified: branches/ocfs2-1.2/fs/ocfs2/journal.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/journal.c	2006-04-12 21:49:53 UTC (rev 2840)
+++ branches/ocfs2-1.2/fs/ocfs2/journal.c	2006-04-12 21:53:40 UTC (rev 2841)
@@ -117,7 +117,7 @@
 {
 	struct ocfs2_journal_handle *retval = NULL;
 
-	retval = kcalloc(1, sizeof(*retval), GFP_KERNEL);
+	retval = kcalloc(1, sizeof(*retval), GFP_NOFS);
 	if (!retval) {
 		mlog(ML_ERROR, "Failed to allocate memory for journal "
 		     "handle!\n");
@@ -972,7 +972,7 @@
 {
 	struct ocfs2_la_recovery_item *item;
 
-	item = kmalloc(sizeof(struct ocfs2_la_recovery_item), GFP_KERNEL);
+	item = kmalloc(sizeof(struct ocfs2_la_recovery_item), GFP_NOFS);
 	if (!item) {
 		/* Though we wish to avoid it, we are in fact safe in
 		 * skipping local alloc cleanup as fsck.ocfs2 is more

Modified: branches/ocfs2-1.2/fs/ocfs2/uptodate.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/uptodate.c	2006-04-12 21:49:53 UTC (rev 2840)
+++ branches/ocfs2-1.2/fs/ocfs2/uptodate.c	2006-04-12 21:53:40 UTC (rev 2841)
@@ -335,7 +335,7 @@
 	mlog(0, "Inode %"MLFu64", block %llu, expand = %d\n",
 	     oi->ip_blkno, (unsigned long long) block, expand_tree);
 
-	new = kmem_cache_alloc(ocfs2_uptodate_cachep, GFP_KERNEL);
+	new = kmem_cache_alloc(ocfs2_uptodate_cachep, GFP_NOFS);
 	if (!new) {
 		mlog_errno(-ENOMEM);
 		return;
@@ -347,7 +347,7 @@
 		 * has no way of tracking that. */
 		for(i = 0; i < OCFS2_INODE_MAX_CACHE_ARRAY; i++) {
 			tree[i] = kmem_cache_alloc(ocfs2_uptodate_cachep,
-						   GFP_KERNEL);
+						   GFP_NOFS);
 			if (!tree[i]) {
 				mlog_errno(-ENOMEM);
 				goto out_free;

Modified: branches/ocfs2-1.2/fs/ocfs2/vote.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/vote.c	2006-04-12 21:49:53 UTC (rev 2840)
+++ branches/ocfs2-1.2/fs/ocfs2/vote.c	2006-04-12 21:53:40 UTC (rev 2841)
@@ -598,7 +598,7 @@
 {
 	struct ocfs2_net_wait_ctxt *w;
 
-	w = kcalloc(1, sizeof(*w), GFP_KERNEL);
+	w = kcalloc(1, sizeof(*w), GFP_NOFS);
 	if (!w) {
 		mlog_errno(-ENOMEM);
 		goto bail;
@@ -761,7 +761,7 @@
 
 	BUG_ON(!ocfs2_is_valid_vote_request(type));
 
-	request = kcalloc(1, sizeof(*request), GFP_KERNEL);
+	request = kcalloc(1, sizeof(*request), GFP_NOFS);
 	if (!request) {
 		mlog_errno(-ENOMEM);
 	} else {
@@ -1139,7 +1139,7 @@
 	struct ocfs2_super *osb = data;
 	struct ocfs2_vote_work *work;
 
-	work = kmalloc(sizeof(struct ocfs2_vote_work), GFP_KERNEL);
+	work = kmalloc(sizeof(struct ocfs2_vote_work), GFP_NOFS);
 	if (!work) {
 		status = -ENOMEM;
 		mlog_errno(status);