[Ocfs2-commits] smushran commits r2912 - branches/ocfs2-1.2/fs/ocfs2/dlm

[svn-commits@oss.oracle.com]

Author: smushran
Signed-off-by: mfasheh
Date: 2006-05-01 17:36:57 -0500 (Mon, 01 May 2006)
New Revision: 2912

Modified:
   branches/ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c
Log:
replace GFP_NOFS allocs in dlmdomains with GFP_KERNEL
Signed-off-by: mfasheh

Modified: branches/ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c	2006-04-26 22:22:29 UTC (rev 2911)
+++ branches/ocfs2-1.2/fs/ocfs2/dlm/dlmdomain.c	2006-05-01 22:36:57 UTC (rev 2912)
@@ -904,7 +904,7 @@
 
 	mlog_entry("%p", dlm);
 
-	ctxt = kcalloc(1, sizeof(*ctxt), GFP_NOFS);
+	ctxt = kcalloc(1, sizeof(*ctxt), GFP_KERNEL);
 	if (!ctxt) {
 		status = -ENOMEM;
 		mlog_errno(status);
@@ -1207,13 +1207,13 @@
 	int i;
 	struct dlm_ctxt *dlm = NULL;
 
-	dlm = kcalloc(1, sizeof(*dlm), GFP_NOFS);
+	dlm = kcalloc(1, sizeof(*dlm), GFP_KERNEL);
 	if (!dlm) {
 		mlog_errno(-ENOMEM);
 		goto leave;
 	}
 
-	dlm->name = kmalloc(strlen(domain) + 1, GFP_NOFS);
+	dlm->name = kmalloc(strlen(domain) + 1, GFP_KERNEL);
 	if (dlm->name == NULL) {
 		mlog_errno(-ENOMEM);
 		kfree(dlm);
@@ -1221,7 +1221,7 @@
 		goto leave;
 	}
 
-	dlm->lockres_hash = (struct hlist_head *) __get_free_page(GFP_NOFS);
+	dlm->lockres_hash = (struct hlist_head *) __get_free_page(GFP_KERNEL);
 	if (!dlm->lockres_hash) {
 		mlog_errno(-ENOMEM);
 		kfree(dlm->name);