Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / fs / dlm / lockspace.c

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 3f6cb42..109333c 100644 (file)
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -66,7 +66,7 @@ static ssize_t dlm_event_store(struct dlm_ls *ls, const char *buf, size_t len)
 
 static ssize_t dlm_id_show(struct dlm_ls *ls, char *buf)
 {
-       return sprintf(buf, "%u\n", ls->ls_global_id);
+       return snprintf(buf, PAGE_SIZE, "%u\n", ls->ls_global_id);
 }
 
 static ssize_t dlm_id_store(struct dlm_ls *ls, const char *buf, size_t len)
@@ -78,7 +78,12 @@ static ssize_t dlm_id_store(struct dlm_ls *ls, const char *buf, size_t len)
 static ssize_t dlm_recover_status_show(struct dlm_ls *ls, char *buf)
 {
        uint32_t status = dlm_recover_status(ls);
-       return sprintf(buf, "%x\n", status);
+       return snprintf(buf, PAGE_SIZE, "%x\n", status);
+}
+
+static ssize_t dlm_recover_nodeid_show(struct dlm_ls *ls, char *buf)
+{
+       return snprintf(buf, PAGE_SIZE, "%d\n", ls->ls_recover_nodeid);
 }
 
 struct dlm_attr {
@@ -108,11 +113,17 @@ static struct dlm_attr dlm_attr_recover_status = {
        .show  = dlm_recover_status_show
 };
 
+static struct dlm_attr dlm_attr_recover_nodeid = {
+       .attr  = {.name = "recover_nodeid", .mode = S_IRUGO},
+       .show  = dlm_recover_nodeid_show
+};
+
 static struct attribute *dlm_attrs[] = {
        &dlm_attr_control.attr,
        &dlm_attr_event.attr,
        &dlm_attr_id.attr,
        &dlm_attr_recover_status.attr,
+       &dlm_attr_recover_nodeid.attr,
        NULL,
 };
 
@@ -446,7 +457,8 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
        memset(&ls->ls_stub_rsb, 0, sizeof(struct dlm_rsb));
        ls->ls_stub_rsb.res_ls = ls;
 
-       ls->ls_debug_dentry = NULL;
+       ls->ls_debug_rsb_dentry = NULL;
+       ls->ls_debug_waiters_dentry = NULL;
 
        init_waitqueue_head(&ls->ls_uevent_wait);
        ls->ls_uevent_result = 0;
@@ -476,16 +488,17 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
 
        down_write(&ls->ls_in_recovery);
 
+       spin_lock(&lslist_lock);
+       list_add(&ls->ls_list, &lslist);
+       spin_unlock(&lslist_lock);
+
+       /* needs to find ls in lslist */
        error = dlm_recoverd_start(ls);
        if (error) {
                log_error(ls, "can't start dlm_recoverd %d", error);
                goto out_rcomfree;
        }
 
-       spin_lock(&lslist_lock);
-       list_add(&ls->ls_list, &lslist);
-       spin_unlock(&lslist_lock);
-
        dlm_create_debug_file(ls);
 
        error = kobject_setup(ls);
@@ -507,11 +520,11 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
        kobject_unregister(&ls->ls_kobj);
  out_del:
        dlm_delete_debug_file(ls);
+       dlm_recoverd_stop(ls);
+ out_rcomfree:
        spin_lock(&lslist_lock);
        list_del(&ls->ls_list);
        spin_unlock(&lslist_lock);
-       dlm_recoverd_stop(ls);
- out_rcomfree:
        kfree(ls->ls_recover_buf);
  out_dirfree:
        kfree(ls->ls_dirtbl);