4 files changed, 34 insertions, 36 deletions

diff --git a/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c
index 41c5b04caaba..f2efff424224 100644
--- a/fs/gfs2/locking/dlm/mount.c
+++ b/fs/gfs2/locking/dlm/mount.c
@@ -67,6 +67,11 @@ static int make_args(struct gdlm_ls *ls, char *data_arg, int *nodir)
         memset(data, 0, 256);
         strncpy(data, data_arg, 255);
 
+        if (!strlen(data)) {
+                log_error("no mount options, (u)mount helpers not installed");
+                return -EINVAL;
+        }
+
         for (options = data; (x = strsep(&options, ":")); ) {
                 if (!*x)
                         continue;
diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
index 1f7b038530b4..2ebd374b3143 100644
--- a/fs/gfs2/locking/dlm/plock.c
+++ b/fs/gfs2/locking/dlm/plock.c
@@ -89,15 +89,19 @@ int gdlm_plock(void *lockspace, struct lm_lockname *name,
         op->info.number         = name->ln_number;
         op->info.start          = fl->fl_start;
         op->info.end            = fl->fl_end;
-        op->info.owner          = (__u64)(long) fl->fl_owner;
         if (fl->fl_lmops && fl->fl_lmops->fl_grant) {
+                /* fl_owner is lockd which doesn't distinguish
+                   processes on the nfs client */
+                op->info.owner  = (__u64) fl->fl_pid;
                 xop->callback   = fl->fl_lmops->fl_grant;
                 locks_init_lock(&xop->flc);
                 locks_copy_lock(&xop->flc, fl);
                 xop->fl         = fl;
                 xop->file       = file;
-        } else
+        } else {
+                op->info.owner  = (__u64)(long) fl->fl_owner;
                 xop->callback   = NULL;
+        }
 
         send_op(op);
 
@@ -203,7 +207,10 @@ int gdlm_punlock(void *lockspace, struct lm_lockname *name,
         op->info.number         = name->ln_number;
         op->info.start          = fl->fl_start;
         op->info.end            = fl->fl_end;
-        op->info.owner          = (__u64)(long) fl->fl_owner;
+        if (fl->fl_lmops && fl->fl_lmops->fl_grant)
+                op->info.owner  = (__u64) fl->fl_pid;
+        else
+                op->info.owner  = (__u64)(long) fl->fl_owner;
 
         send_op(op);
         wait_event(recv_wq, (op->done != 0));
@@ -242,7 +249,10 @@ int gdlm_plock_get(void *lockspace, struct lm_lockname *name,
         op->info.number         = name->ln_number;
         op->info.start          = fl->fl_start;
         op->info.end            = fl->fl_end;
-        op->info.owner          = (__u64)(long) fl->fl_owner;
+        if (fl->fl_lmops && fl->fl_lmops->fl_grant)
+                op->info.owner  = (__u64) fl->fl_pid;
+        else
+                op->info.owner  = (__u64)(long) fl->fl_owner;
 
         send_op(op);
         wait_event(recv_wq, (op->done != 0));
diff --git a/fs/gfs2/locking/dlm/sysfs.c b/fs/gfs2/locking/dlm/sysfs.c
index ae9e6a25fe2b..a87b09839761 100644
--- a/fs/gfs2/locking/dlm/sysfs.c
+++ b/fs/gfs2/locking/dlm/sysfs.c
@@ -189,51 +189,39 @@ static struct kobj_type gdlm_ktype = {
         .sysfs_ops     = &gdlm_attr_ops,
 };
 
-static struct kset gdlm_kset = {
-        .ktype  = &gdlm_ktype,
-};
+static struct kset *gdlm_kset;
 
 int gdlm_kobject_setup(struct gdlm_ls *ls, struct kobject *fskobj)
 {
         int error;
 
-        error = kobject_set_name(&ls->kobj, "%s", "lock_module");
-        if (error) {
-                log_error("can't set kobj name %d", error);
-                return error;
-        }
-
-        ls->kobj.kset = &gdlm_kset;
-        ls->kobj.ktype = &gdlm_ktype;
-        ls->kobj.parent = fskobj;
-
-        error = kobject_register(&ls->kobj);
+        ls->kobj.kset = gdlm_kset;
+        error = kobject_init_and_add(&ls->kobj, &gdlm_ktype, fskobj,
+                                     "lock_module");
         if (error)
                 log_error("can't register kobj %d", error);
+        kobject_uevent(&ls->kobj, KOBJ_ADD);
 
         return error;
 }
 
 void gdlm_kobject_release(struct gdlm_ls *ls)
 {
-        kobject_unregister(&ls->kobj);
+        kobject_put(&ls->kobj);
 }
 
 int gdlm_sysfs_init(void)
 {
-        int error;
-
-        kobject_set_name(&gdlm_kset.kobj, "lock_dlm");
-        kobj_set_kset_s(&gdlm_kset, kernel_subsys);
-        error = kset_register(&gdlm_kset);
-        if (error)
-                printk("lock_dlm: cannot register kset %d\n", error);
-
-        return error;
+        gdlm_kset = kset_create_and_add("lock_dlm", NULL, kernel_kobj);
+        if (!gdlm_kset) {
+                printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__);
+                return -ENOMEM;
+        }
+        return 0;
 }
 
 void gdlm_sysfs_exit(void)
 {
-        kset_unregister(&gdlm_kset);
+        kset_unregister(gdlm_kset);
 }
 
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c
index bd938f06481d..521694fc19d6 100644
--- a/fs/gfs2/locking/dlm/thread.c
+++ b/fs/gfs2/locking/dlm/thread.c
@@ -273,18 +273,13 @@ static int gdlm_thread(void *data, int blist)
         struct gdlm_ls *ls = (struct gdlm_ls *) data;
         struct gdlm_lock *lp = NULL;
         uint8_t complete, blocking, submit, drop;
-        DECLARE_WAITQUEUE(wait, current);
 
         /* Only thread1 is allowed to do blocking callbacks since gfs
            may wait for a completion callback within a blocking cb. */
 
         while (!kthread_should_stop()) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                add_wait_queue(&ls->thread_wait, &wait);
-                if (no_work(ls, blist))
-                        schedule();
-                remove_wait_queue(&ls->thread_wait, &wait);
-                set_current_state(TASK_RUNNING);
+                wait_event_interruptible(ls->thread_wait,
+                                !no_work(ls, blist) || kthread_should_stop());
 
                 complete = blocking = submit = drop = 0;