Ocfs2 fixes
PATCH 1/1 Ocfs2 fixes
This reverts a portion of the 'user-stack' unmount behavior back to how we have traditionally handled unmount notification - via usermode callout to a small helper application. Well, 'revert' is probably the wrong term. The user-stack code explicitly never called the helper because we incorrectly thought that an umount.ocfs2 might be able to do the work of tracking final-unmount. As it turns out, that's not really possible (bind-mounts in particular made this difficult) so we're going to go with the tried-and-true umount handling for all Ocfs2 cluster stacks.
Please pull from 'upstream-linus' branch ofgit://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git upstream-linus
to receive the following updates:
fs/ocfs2/cluster/nodemanager.c | 74 +------------------------ fs/ocfs2/cluster/nodemanager.h | 4 - fs/ocfs2/stack_o2cb.c | 41 +------------- fs/ocfs2/stack_user.c | 3 +- fs/ocfs2/stackglue.c | 119 +++++++++++++++++++++++++++++++++++++++- fs/ocfs2/stackglue.h | 19 +----- 6 files changed, 123 insertions(+), 137 deletions(-)
Joel Becker (3):
ocfs2: Move the hb_ctl_path sysctl into the stack glue.
ocfs2: Move the call of ocfs2_hb_ctl into the stack glue.
ocfs2: Remove ->hangup() from stack glue operations.
fs/ocfs2/cluster/nodemanager.c +1 -73
@@ -21,7 +21,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/sysctl.h> #include <linux/configfs.h> #include "tcp.h"
@@ -36,65 +35,6 @@* cluster references throughout where nodes are looked up */ struct o2nm_cluster *o2nm_single_cluster =NULL ; -#define OCFS2_MAX_HB_CTL_PATH 256 -static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH ] ="/sbin/ocfs2_hb_ctl" ; - -static ctl_table ocfs2_nm_table[] = { - { - .ctl_name =1 , - .procname ="hb_ctl_path" , - .data = ocfs2_hb_ctl_path, - .maxlen =OCFS2_MAX_HB_CTL_PATH , - .mode =0644 , - .proc_handler = &proc_dostring, - .strategy = &sysctl_string, - }, - { .ctl_name =0 } -}; - -static ctl_table ocfs2_mod_table[] = { - { - .ctl_name =FS_OCFS2_NM , - .procname ="nm" , - .data =NULL , - .maxlen =0 , - .mode =0555 , - .child = ocfs2_nm_table - }, - { .ctl_name =0 } -}; - -static ctl_table ocfs2_kern_table[] = { - { - .ctl_name =FS_OCFS2 , - .procname ="ocfs2" , - .data =NULL , - .maxlen =0 , - .mode =0555 , - .child = ocfs2_mod_table - }, - { .ctl_name =0 } -}; - -static ctl_table ocfs2_root_table[] = { - { - .ctl_name =CTL_FS , - .procname ="fs" , - .data =NULL , - .maxlen =0 , - .mode =0555 , - .child = ocfs2_kern_table - }, - { .ctl_name =0 } -}; - -static struct ctl_table_header *ocfs2_table_header =NULL ; - -const char *o2nm_get_hb_ctl_path (void ) -{ -return ocfs2_hb_ctl_path; -} -EXPORT_SYMBOL_GPL (o2nm_get_hb_ctl_path);struct o2nm_node *o2nm_get_node_by_num (u8 node_num) {
@@ -941,9 +881,6 @@ void o2nm_undepend_this_node(void) static void __exit exit_o2nm(void) { -if (ocfs2_table_header) -unregister_sysctl_table (ocfs2_table_header); -/* XXX sync with hb callbacks and shut down hb? */ o2net_unregister_hb_callbacks ();configfs_unregister_subsystem (&o2nm_cluster_group.cs_subsys);
@@ -964,16 +901,9 @@ static int __init init_o2nm(void)if (ret) goto out; - ocfs2_table_header =register_sysctl_table (ocfs2_root_table); -if (!ocfs2_table_header) { -printk (KERN_ERR "nodemanager: unable to register sysctl\n" ); - ret = -ENOMEM ;/* or something. */ - goto out_o2net; - } - ret =o2net_register_hb_callbacks ();if (ret) - goto out_sysctl; + goto out_o2net;config_group_init (&o2nm_cluster_group.cs_subsys.su_group);mutex_init (&o2nm_cluster_group.cs_subsys.su_mutex);
@@ -990,8 +920,6 @@ static int __init init_o2nm(void)configfs_unregister_subsystem (&o2nm_cluster_group.cs_subsys); out_callbacks:o2net_unregister_hb_callbacks (); -out_sysctl: -unregister_sysctl_table (ocfs2_table_header); out_o2net:o2net_exit (); out:
fs/ocfs2/cluster/nodemanager.h +0 -4
@@ -33,10 +33,6 @@#include <linux/configfs.h> #include <linux/rbtree.h> -#define FS_OCFS2_NM 1 - -const char *o2nm_get_hb_ctl_path (void ); -struct o2nm_node {spinlock_t nd_lock;struct config_item nd_item;
fs/ocfs2/stack_o2cb.c +1 -40
59 lines not on this page · raw message
fs/ocfs2/stack_user.c +1 -2
@@ -816,8 +816,7 @@ out:return rc; } -static int user_cluster_disconnect (struct ocfs2_cluster_connection *conn, -int hangup_pending) +static int user_cluster_disconnect (struct ocfs2_cluster_connection *conn) {dlm_release_lockspace (conn->cc_lockspace,2 ); conn->cc_lockspace =NULL ;
fs/ocfs2/stackglue.c +116 -3
169 lines not on this page · raw message
fs/ocfs2/stackglue.h +4 -15
@@ -134,22 +134,10 @@ struct ocfs2_stack_operations {* be freed. Thus, a stack must not return from ->disconnect() * until it will no longer reference the conn pointer. * -* If hangup_pending is zero, ocfs2_cluster_disconnect() will also -* be dropping the reference on the module. +* Once this call returns, the stack glue will be dropping this +* connection's reference on the module. */ -int (*disconnect)(struct ocfs2_cluster_connection *conn, -int hangup_pending); - -/* -* ocfs2_cluster_hangup() exists for compatibility with older -* ocfs2 tools. Only the classic stack really needs it. As such -* ->hangup() is not required of all stacks. See the comment by -* ocfs2_cluster_hangup() for more details. -* -* Note that ocfs2_cluster_hangup() can only be called if -* hangup_pending was passed to ocfs2_cluster_disconnect(). -*/ -void (*hangup)(const char *group,int grouplen); +int (*disconnect)(struct ocfs2_cluster_connection *conn);/* * ->this_node() returns the cluster's unique identifier for the
@@ -258,4 +246,5 @@ void ocfs2_stack_glue_set_locking_protocol(struct ocfs2_locking_protocol *proto)/* Used by stack plugins */ int ocfs2_stack_glue_register (struct ocfs2_stack_plugin *plugin);void ocfs2_stack_glue_unregister (struct ocfs2_stack_plugin *plugin); +#endif /* STACKGLUE_H */