3 files changed, 13 insertions, 6 deletions

diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index eac23bd288b2..c4e7d721bd8d 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -438,7 +438,7 @@ static struct config_group *make_cluster(struct config_group *g,
         kfree(gps);
         kfree(sps);
         kfree(cms);
-        return NULL;
+        return ERR_PTR(-ENOMEM);
 }
 
 static void drop_cluster(struct config_group *g, struct config_item *i)
@@ -495,7 +495,7 @@ static struct config_group *make_space(struct config_group *g, const char *name)
         kfree(sp);
         kfree(gps);
         kfree(nds);
-        return NULL;
+        return ERR_PTR(-ENOMEM);
 }
 
 static void drop_space(struct config_group *g, struct config_item *i)
@@ -528,7 +528,7 @@ static struct config_item *make_comm(struct config_group *g, const char *name)
 
         cm = kzalloc(sizeof(struct comm), GFP_KERNEL);
         if (!cm)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         config_item_init_type_name(&cm->item, name, &comm_type);
         cm->nodeid = -1;
@@ -561,7 +561,7 @@ static struct config_item *make_node(struct config_group *g, const char *name)
 
         nd = kzalloc(sizeof(struct node), GFP_KERNEL);
         if (!nd)
-                return NULL;
+                return ERR_PTR(-ENOMEM);
 
         config_item_init_type_name(&nd->item, name, &node_type);
         nd->nodeid = -1;
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index 78878c5781ca..eba87ff3177b 100644
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -116,7 +116,7 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
         if (xop->callback == NULL)
                 wait_event(recv_wq, (op->done != 0));
         else {
-                rv = -EINPROGRESS;
+                rv = FILE_LOCK_DEFERRED;
                 goto out;
         }
 
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 1aa76b32d056..929e48ae7591 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -15,6 +15,7 @@
 #include <linux/poll.h>
 #include <linux/signal.h>
 #include <linux/spinlock.h>
+#include <linux/smp_lock.h>
 #include <linux/dlm.h>
 #include <linux/dlm_device.h>
 
@@ -618,13 +619,17 @@ static int device_open(struct inode *inode, struct file *file)
         struct dlm_user_proc *proc;
         struct dlm_ls *ls;
 
+        lock_kernel();
         ls = dlm_find_lockspace_device(iminor(inode));
-        if (!ls)
+        if (!ls) {
+                unlock_kernel();
                 return -ENOENT;
+        }
 
         proc = kzalloc(sizeof(struct dlm_user_proc), GFP_KERNEL);
         if (!proc) {
                 dlm_put_lockspace(ls);
+                unlock_kernel();
                 return -ENOMEM;
         }
 
@@ -636,6 +641,7 @@ static int device_open(struct inode *inode, struct file *file)
         spin_lock_init(&proc->locks_spin);
         init_waitqueue_head(&proc->wait);
         file->private_data = proc;
+        unlock_kernel();
 
         return 0;
 }
@@ -870,6 +876,7 @@ static unsigned int device_poll(struct file *file, poll_table *wait)
 
 static int ctl_device_open(struct inode *inode, struct file *file)
 {
+        cycle_kernel_lock();
         file->private_data = NULL;
         return 0;
 }