search for: o2hb_live_lock

All, This is hopefully the final drop of the patches for adding global heartbeat to the o2cb stack. The diff from the previous set is here: http://oss.oracle.com/~smushran/global-hb-diff-2010-10-07 Implemented most of the suggestions provided by Joel and Wengang. The most important one was to activate the feature only at the end, Also, got mostly a clean run with checkpatch.pl. Sunil

...ed for reading * o2hb_dead_threshold as it can't change once regions are active and * it's not interesting to anyone until then anyway. */ static void o2hb_dead_threshold_set(unsigned int threshold) { if (threshold > O2HB_MIN_DEAD_THRESHOLD) { spin_lock(&o2hb_live_lock); if (list_empty(&o2hb_all_regions)) o2hb_dead_threshold = threshold; spin_unlock(&o2hb_live_lock); } } So, is it a configfs or ocfs problem ? Who is in charge of locking the configfs access ? Thanks ! Regards, Benoit...

...ed for reading * o2hb_dead_threshold as it can't change once regions are active and * it's not interesting to anyone until then anyway. */ static void o2hb_dead_threshold_set(unsigned int threshold) { if (threshold > O2HB_MIN_DEAD_THRESHOLD) { spin_lock(&o2hb_live_lock); if (list_empty(&o2hb_all_regions)) o2hb_dead_threshold = threshold; spin_unlock(&o2hb_live_lock); } } So, is it a configfs or ocfs problem ? Who is in charge of locking the configfs access ? Thanks ! Regards, Benoit...

...g = arg; + struct o2nm_node *node = o2nm_get_node_by_num(o2nm_this_node()); mlog(ML_ERROR, "Heartbeat write timeout to device %s after %u " "milliseconds\n", reg->hr_dev_name, @@ -588,6 +589,7 @@ static void o2hb_queue_node_event(struct { assert_spin_locked(&o2hb_live_lock); + INIT_LIST_HEAD(&event->hn_item); event->hn_event_type = type; event->hn_node = node; event->hn_node_num = node_num; @@ -598,6 +600,18 @@ static void o2hb_queue_node_event(struct list_add_tail(&event->hn_item, &o2hb_node_events); } +void o2hb_notify(enum o...

...n_fs() -> simple_pin_fs() -> vfs_kern_mount() -> vfs_parse_fs_string() fs/ocfs2/cluster/heartbeat.c 2338 static int o2hb_region_inc_user(const char *region_uuid) 2339 { 2340 int ret = 0; 2341 2342 spin_lock(&o2hb_live_lock); Lock. 2343 2344 /* local heartbeat */ 2345 if (!o2hb_global_heartbeat_active()) { 2346 ret = o2hb_region_pin(region_uuid); This function starts the call tree to vfs_parse_fs_string(). 2347 goto unlock; 2348 } 2349 regards...

...fs2/cluster/heartbeat.c 2006-04-14 12:42:30.000000000 +0200 @@ -1785,7 +1785,6 @@ return 1; } -EXPORT_SYMBOL_GPL(o2hb_check_node_heartbeating_from_callback); /* Makes sure our local node is configured with a node number, and is * heartbeating. */ @@ -1821,4 +1820,3 @@ spin_unlock(&o2hb_live_lock); } -EXPORT_SYMBOL_GPL(o2hb_stop_all_regions); --- linux-2.6.17-rc1-mm2-full/fs/ocfs2/cluster/nodemanager.c.old 2006-04-14 12:42:49.000000000 +0200 +++ linux-2.6.17-rc1-mm2-full/fs/ocfs2/cluster/nodemanager.c 2006-04-14 12:43:40.000000000 +0200 @@ -123,7 +123,6 @@ out: return node; } -EXPORT_S...

...k_heartbeat.c --- linux-2.6.16-rc4.ocfs2-staging1/fs/ocfs2/cluster/disk_heartbeat.c 2006-02-21 11:44:46.000000000 -0500 +++ linux-2.6.16-rc4.ocfs2-staging2/fs/ocfs2/cluster/disk_heartbeat.c 2006-02-21 11:44:53.000000000 -0500 @@ -1509,7 +1509,7 @@ void o2hb_stop_all_regions(void) spin_unlock(&o2hb_live_lock); } -static int __init o2hb_disk_heartbeat_init(void) +int o2hb_disk_heartbeat_init(void) { int i; @@ -1520,14 +1520,10 @@ static int __init o2hb_disk_heartbeat_in return o2hb_register_heartbeat_group(&disk_heartbeat_group); } -static void __exit o2hb_disk_heartbeat_exit(void) +voi...

...i = 0; i < reg->hr_num_pages; i++) { @@ -978,8 +977,7 @@ static void o2hb_region_release(struct config_item *item) if (reg->hr_bdev) blkdev_put(reg->hr_bdev, FMODE_READ|FMODE_WRITE); - if (reg->hr_slots) - kfree(reg->hr_slots); + kfree(reg->hr_slots); spin_lock(&o2hb_live_lock); list_del(&reg->hr_all_item); diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 9fbe849..7530d10 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -1083,10 +1083,8 @@ out: o2net_debug_del_nst(&nst); /* must be before dropping sc and node */ if (s...

I'm running a bit late with the e-mail this time around, but I think that's ok since there really isn't any major new features here - the bulk of the Ocfs2 update is bug fixes, or cleanups. The same goes for configfs. The only two things that could be described as features would be: - Sunil has updated Ocfs2 to provide even more live cluster locking information via debugfs. - Joel