[Ocfs2-commits] smushran commits r2815 - branches/ocfs2-1.2-cert/patches
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Mon Apr 3 14:23:54 CDT 2006
Author: smushran
Signed-off-by: khackel
Date: 2006-04-03 14:23:53 -0500 (Mon, 03 Apr 2006)
New Revision: 2815
Added:
branches/ocfs2-1.2-cert/patches/hb-replace_gfp_kernel_with_nofs
Modified:
branches/ocfs2-1.2-cert/patches/dlm-replace_gfp_kernel_with_nofs
branches/ocfs2-1.2-cert/patches/series
Log:
patche dlm-replace_gfp_kernel_with_nofs fixed and hb-replace_gfp_kernel_with_nofs added
Signed-off-by: khackel
Modified: branches/ocfs2-1.2-cert/patches/dlm-replace_gfp_kernel_with_nofs
===================================================================
--- branches/ocfs2-1.2-cert/patches/dlm-replace_gfp_kernel_with_nofs 2006-04-03 18:31:35 UTC (rev 2814)
+++ branches/ocfs2-1.2-cert/patches/dlm-replace_gfp_kernel_with_nofs 2006-04-03 19:23:53 UTC (rev 2815)
@@ -1,7 +1,7 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 10:47:03.415750000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 10:48:29.242215000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 12:11:38.068749000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmrecovery.c 2006-04-03 12:11:38.291709000 -0700
@@ -769,7 +769,7 @@
}
BUG_ON(num == dead_node);
@@ -42,7 +42,7 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c
===================================================================
--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdebug.c 2006-03-27 14:36:39.586328000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c 2006-04-03 10:49:56.119288000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdebug.c 2006-04-03 12:11:38.299709000 -0700
@@ -177,7 +177,7 @@
mlog(ML_ERROR, "user passed too little data: %d bytes\n", len);
goto leave;
@@ -63,14 +63,14 @@
ret = -ENOMEM;
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 10:47:01.265464000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 10:50:35.553705000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 12:11:37.287030000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmdomain.c 2006-04-03 12:18:30.499458000 -0700
@@ -892,7 +892,7 @@
mlog_entry("%p", dlm);
- ctxt = kcalloc(1, sizeof(*ctxt), GFP_KERNEL);
-+ ctxt = kcalloc(1, sizeof(*ctxt), GKP_NOFS);
++ ctxt = kcalloc(1, sizeof(*ctxt), GFP_NOFS);
if (!ctxt) {
status = -ENOMEM;
mlog_errno(status);
@@ -79,14 +79,14 @@
struct dlm_ctxt *dlm = NULL;
- dlm = kcalloc(1, sizeof(*dlm), GFP_KERNEL);
-+ dlm = kcalloc(1, sizeof(*dlm), GKP_NOFS);
++ dlm = kcalloc(1, sizeof(*dlm), GFP_NOFS);
if (!dlm) {
mlog_errno(-ENOMEM);
goto leave;
}
- dlm->name = kmalloc(strlen(domain) + 1, GFP_KERNEL);
-+ dlm->name = kmalloc(strlen(domain) + 1, GKP_NOFS);
++ dlm->name = kmalloc(strlen(domain) + 1, GFP_NOFS);
if (dlm->name == NULL) {
mlog_errno(-ENOMEM);
kfree(dlm);
@@ -95,14 +95,14 @@
}
- dlm->lockres_hash = (struct hlist_head *) __get_free_page(GFP_KERNEL);
-+ dlm->lockres_hash = (struct hlist_head *) __get_free_page(GKP_NOFS);
++ dlm->lockres_hash = (struct hlist_head *) __get_free_page(GFP_NOFS);
if (!dlm->lockres_hash) {
mlog_errno(-ENOMEM);
kfree(dlm->name);
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmfs.c
===================================================================
--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmfs.c 2006-03-27 14:36:39.384360000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmfs.c 2006-04-03 10:51:04.329460000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmfs.c 2006-04-03 12:11:38.318709000 -0700
@@ -116,7 +116,7 @@
* doesn't make sense for LVB writes. */
file->f_flags &= ~O_APPEND;
@@ -132,8 +132,8 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmlock.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmlock.c 2006-04-03 10:47:00.635491000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmlock.c 2006-04-03 10:51:27.635965000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmlock.c 2006-04-03 12:11:36.702351000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmlock.c 2006-04-03 12:11:38.332709000 -0700
@@ -408,13 +408,13 @@
struct dlm_lock *lock;
int kernel_allocated = 0;
@@ -152,8 +152,8 @@
return NULL;
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c
===================================================================
---- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 10:47:01.878142000 -0700
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 10:52:12.530632000 -0700
+--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 12:11:37.861956000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/dlmmaster.c 2006-04-03 12:11:38.354709000 -0700
@@ -699,11 +699,11 @@
{
struct dlm_lock_resource *res;
@@ -224,7 +224,7 @@
Index: ocfs2-1.2-cert/fs/ocfs2/dlm/userdlm.c
===================================================================
--- ocfs2-1.2-cert.orig/fs/ocfs2/dlm/userdlm.c 2006-03-31 14:11:14.075366000 -0800
-+++ ocfs2-1.2-cert/fs/ocfs2/dlm/userdlm.c 2006-04-03 10:56:04.232160000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/dlm/userdlm.c 2006-04-03 12:11:38.380709000 -0700
@@ -672,7 +672,7 @@
u32 dlm_key;
char *domain;
Added: branches/ocfs2-1.2-cert/patches/hb-replace_gfp_kernel_with_nofs
===================================================================
--- branches/ocfs2-1.2-cert/patches/hb-replace_gfp_kernel_with_nofs 2006-04-03 18:31:35 UTC (rev 2814)
+++ branches/ocfs2-1.2-cert/patches/hb-replace_gfp_kernel_with_nofs 2006-04-03 19:23:53 UTC (rev 2815)
@@ -0,0 +1,65 @@
+Index: ocfs2-1.2-cert/fs/ocfs2/cluster/heartbeat.c
+===================================================================
+--- ocfs2-1.2-cert.orig/fs/ocfs2/cluster/heartbeat.c 2006-04-03 11:46:15.477271000 -0700
++++ ocfs2-1.2-cert/fs/ocfs2/cluster/heartbeat.c 2006-04-03 11:50:32.692774000 -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;
+@@ -1337,14 +1337,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;
+@@ -1363,14 +1363,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;
+@@ -1660,7 +1660,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 */
+
+@@ -1709,7 +1709,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;
+
Modified: branches/ocfs2-1.2-cert/patches/series
===================================================================
--- branches/ocfs2-1.2-cert/patches/series 2006-04-03 18:31:35 UTC (rev 2814)
+++ branches/ocfs2-1.2-cert/patches/series 2006-04-03 19:23:53 UTC (rev 2815)
@@ -27,4 +27,5 @@
continue-finalize-reco.patch
fix-wait-in-mastery.patch
lame-timeout-dbg.patch
-dlm-replace_gfp_kernel_with_nofs
+dlm-replace_gfp_kernel_with_nofs
+hb-replace_gfp_kernel_with_nofs
More information about the Ocfs2-commits
mailing list