]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[DLM] fix oops in kref_put when removing a lockspace
authorPatrick Caulfield <pcaulfie@redhat.com>
Mon, 6 Nov 2006 08:53:28 +0000 (08:53 +0000)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 6 Nov 2006 14:28:01 +0000 (09:28 -0500)
Now that the lockspace struct is freed when the last sysfs object is released
this patch prevents use of that lockspace by sysfs. We attempt to re-get the
lockspace from the lockspace list and fail the request if it has been removed.

Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
fs/dlm/lockspace.c

index 499ee11563653d77842689a3f8b704c7973bd297..f8842ca443c24dda7e24344ee38a5a61e560acf3 100644 (file)
@@ -43,6 +43,10 @@ static ssize_t dlm_control_store(struct dlm_ls *ls, const char *buf, size_t len)
        ssize_t ret = len;
        int n = simple_strtol(buf, NULL, 0);
 
+       ls = dlm_find_lockspace_local(ls->ls_local_handle);
+       if (!ls)
+               return -EINVAL;
+
        switch (n) {
        case 0:
                dlm_ls_stop(ls);
@@ -53,6 +57,7 @@ static ssize_t dlm_control_store(struct dlm_ls *ls, const char *buf, size_t len)
        default:
                ret = -EINVAL;
        }
+       dlm_put_lockspace(ls);
        return ret;
 }