1 files changed, 8 insertions, 14 deletions

diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index c021280dd462..353fc35c6748 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -21,6 +21,7 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 #include <linux/mutex.h>
+#include <linux/smp_lock.h>
 #include <linux/reboot.h>
 #include <asm/uaccess.h>
 
@@ -549,26 +550,17 @@ static ssize_t ocfs2_control_read(struct file *file,
                                   size_t count,
                                   loff_t *ppos)
 {
-        char *proto_string = OCFS2_CONTROL_PROTO;
-        size_t to_write = 0;
-
-        if (*ppos >= OCFS2_CONTROL_PROTO_LEN)
-                return 0;
-
-        to_write = OCFS2_CONTROL_PROTO_LEN - *ppos;
-        if (to_write > count)
-                to_write = count;
-        if (copy_to_user(buf, proto_string + *ppos, to_write))
-                return -EFAULT;
+        ssize_t ret;
 
-        *ppos += to_write;
+        ret = simple_read_from_buffer(buf, count, ppos,
+                        OCFS2_CONTROL_PROTO, OCFS2_CONTROL_PROTO_LEN);
 
         /* Have we read the whole protocol list? */
-        if (*ppos >= OCFS2_CONTROL_PROTO_LEN)
+        if (ret > 0 && *ppos >= OCFS2_CONTROL_PROTO_LEN)
                 ocfs2_control_set_handshake_state(file,
                                                   OCFS2_CONTROL_HANDSHAKE_READ);
 
-        return to_write;
+        return ret;
 }
 
 static int ocfs2_control_release(struct inode *inode, struct file *file)
@@ -619,10 +611,12 @@ static int ocfs2_control_open(struct inode *inode, struct file *file)
                 return -ENOMEM;
         p->op_this_node = -1;
 
+        lock_kernel();
         mutex_lock(&ocfs2_control_lock);
         file->private_data = p;
         list_add(&p->op_list, &ocfs2_control_private_list);
         mutex_unlock(&ocfs2_control_lock);
+        unlock_kernel();
 
         return 0;
 }