[Ocfs2-commits] smushran commits r2822 - branches/ocfs2-1.2-cert/patches
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Tue Apr 4 15:22:12 CDT 2006
Author: smushran
Signed-off-by: khackel
Date: 2006-04-04 15:22:11 -0500 (Tue, 04 Apr 2006)
New Revision: 2822
Added:
branches/ocfs2-1.2-cert/patches/jrnl-change_gfp_kernel_to_nofs
Modified:
branches/ocfs2-1.2-cert/patches/series
Log:
patch jrnl-change_gfp_kernel_to_nofs added
Signed-off-by: khackel
Added: branches/ocfs2-1.2-cert/patches/jrnl-change_gfp_kernel_to_nofs
===================================================================
--- branches/ocfs2-1.2-cert/patches/jrnl-change_gfp_kernel_to_nofs 2006-04-04 20:07:50 UTC (rev 2821)
+++ branches/ocfs2-1.2-cert/patches/jrnl-change_gfp_kernel_to_nofs 2006-04-04 20:22:11 UTC (rev 2822)
@@ -0,0 +1,196 @@
+Index: ocfs2-1.2-cert/fs/ocfs2/extent_map.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/extent_map.c 2006-04-04 13:20:25.271468000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/extent_map.c 2006-04-04 13:20:34.540316000 -0700
+@@ -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;
+ }
+Index: ocfs2-1.2-cert/fs/ocfs2/journal.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/journal.c 2006-04-04 13:20:26.513905000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/journal.c 2006-04-04 13:20:34.559307000 -0700
+@@ -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
+Index: ocfs2-1.2-cert/fs/ocfs2/cluster/nodemanager.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/nodemanager.c 2006-03-27 14:36:35.530640000 -0800
++++ ocfs2-1.2-cert/fs/ocfs2/cluster/nodemanager.c 2006-04-04 13:20:34.575307000 -0700
+@@ -550,7 +550,7 @@
+ if (strlen(name) > O2NM_MAX_NAME_LEN)
+ goto out; /* ENAMETOOLONG */
+
+- node = kcalloc(1, sizeof(struct o2nm_node), GFP_KERNEL);
++ node = kcalloc(1, sizeof(struct o2nm_node), GFP_NOFS);
+ if (node == NULL)
+ goto out; /* ENOMEM */
+
+@@ -658,9 +658,9 @@
+ if (o2nm_single_cluster)
+ goto out; /* ENOSPC */
+
+- cluster = kcalloc(1, sizeof(struct o2nm_cluster), GFP_KERNEL);
+- ns = kcalloc(1, sizeof(struct o2nm_node_group), GFP_KERNEL);
+- defs = kcalloc(3, sizeof(struct config_group *), GFP_KERNEL);
++ cluster = kcalloc(1, sizeof(struct o2nm_cluster), GFP_NOFS);
++ ns = kcalloc(1, sizeof(struct o2nm_node_group), GFP_NOFS);
++ defs = kcalloc(3, sizeof(struct config_group *), GFP_NOFS);
+ o2hb_group = o2hb_alloc_hb_set();
+ if (cluster == NULL || ns == NULL || o2hb_group == NULL || defs == NULL)
+ goto out;
+Index: ocfs2-1.2-cert/fs/ocfs2/cluster/heartbeat.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/heartbeat.c 2006-04-04 13:20:34.283573000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/cluster/heartbeat.c 2006-04-04 13:20:34.591307000 -0700
+@@ -481,7 +481,7 @@
+ o2hb_compute_request_limits(reg, max_slots, &num_bios, &slots_per_bio);
+
+ o2hb_mlog_blocking(reg, &start, "allocating bios for read");
+- bios = kcalloc(num_bios, sizeof(struct bio *), GFP_KERNEL);
++ bios = kcalloc(num_bios, sizeof(struct bio *), GFP_NOFS);
+ o2hb_mlog_blocking_done(reg, &start);
+ if (!bios) {
+ status = -ENOMEM;
+@@ -1339,14 +1339,14 @@
+ char *raw;
+ struct o2hb_disk_slot *slot;
+
+- reg->hr_tmp_block = kmalloc(reg->hr_block_bytes, GFP_KERNEL);
++ reg->hr_tmp_block = kmalloc(reg->hr_block_bytes, GFP_NOFS);
+ if (reg->hr_tmp_block == NULL) {
+ mlog_errno(-ENOMEM);
+ return -ENOMEM;
+ }
+
+ reg->hr_slots = kcalloc(reg->hr_blocks,
+- sizeof(struct o2hb_disk_slot), GFP_KERNEL);
++ sizeof(struct o2hb_disk_slot), GFP_NOFS);
+ if (reg->hr_slots == NULL) {
+ mlog_errno(-ENOMEM);
+ return -ENOMEM;
+@@ -1365,14 +1365,14 @@
+ reg->hr_num_pages, reg->hr_blocks, spp);
+
+ reg->hr_slot_data = kcalloc(reg->hr_num_pages, sizeof(struct page *),
+- GFP_KERNEL);
++ GFP_NOFS);
+ if (!reg->hr_slot_data) {
+ mlog_errno(-ENOMEM);
+ return -ENOMEM;
+ }
+
+ for(i = 0; i < reg->hr_num_pages; i++) {
+- page = alloc_page(GFP_KERNEL);
++ page = alloc_page(GFP_NOFS);
+ if (!page) {
+ mlog_errno(-ENOMEM);
+ return -ENOMEM;
+@@ -1662,7 +1662,7 @@
+ struct o2hb_region *reg = NULL;
+ struct config_item *ret = NULL;
+
+- reg = kcalloc(1, sizeof(struct o2hb_region), GFP_KERNEL);
++ reg = kcalloc(1, sizeof(struct o2hb_region), GFP_NOFS);
+ if (reg == NULL)
+ goto out; /* ENOMEM */
+
+@@ -1711,7 +1711,7 @@
+ struct o2hb_heartbeat_group *hs = NULL;
+ struct config_group *ret = NULL;
+
+- hs = kcalloc(1, sizeof(struct o2hb_heartbeat_group), GFP_KERNEL);
++ hs = kcalloc(1, sizeof(struct o2hb_heartbeat_group), GFP_NOFS);
+ if (hs == NULL)
+ goto out;
+
+Index: ocfs2-1.2-cert/fs/ocfs2/cluster/net_proc.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/net_proc.c 2006-04-04 13:20:31.969270000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/cluster/net_proc.c 2006-04-04 13:20:34.601307000 -0700
+@@ -156,7 +156,7 @@
+ struct seq_file *seq;
+ int ret;
+
+- dummy_nst = kmalloc(sizeof(struct o2net_send_tracking), GFP_KERNEL);
++ dummy_nst = kmalloc(sizeof(struct o2net_send_tracking), GFP_NOFS);
+ if (dummy_nst == NULL) {
+ ret = -ENOMEM;
+ goto out;
+@@ -339,7 +339,7 @@
+ struct seq_file *seq;
+ int ret;
+
+- dummy_sc = kmalloc(sizeof(struct o2net_sock_container), GFP_KERNEL);
++ dummy_sc = kmalloc(sizeof(struct o2net_sock_container), GFP_NOFS);
+ if (dummy_sc == NULL) {
+ ret = -ENOMEM;
+ goto out;
+Index: ocfs2-1.2-cert/fs/ocfs2/vote.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/vote.c 2006-03-27 14:36:42.275400000 -0800
++++ ocfs2-1.2-cert/fs/ocfs2/vote.c 2006-04-04 13:20:34.615307000 -0700
+@@ -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);
Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series 2006-04-04 20:07:50 UTC (rev 2821)
+++ branches/ocfs2-1.2-cert/patches/series 2006-04-04 20:22:11 UTC (rev 2822)
@@ -29,3 +29,4 @@
dlm-replace_gfp_kernel_with_nofs
move-dlm-work-to-thread.patch
hb-add_tracking_around_configured_nodes
+jrnl-change_gfp_kernel_to_nofs
More information about the Ocfs2-commits
mailing list