1 files changed, 10 insertions, 21 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index b3b69fd51330..96fb36cd9874 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -207,7 +207,7 @@ static int mqueue_get_sb(struct file_system_type *fs_type,
         return get_sb_single(fs_type, flags, data, mqueue_fill_super, mnt);
 }
 
-static void init_once(struct kmem_cache *cachep, void *foo)
+static void init_once(void *foo)
 {
         struct mqueue_inode_info *p = (struct mqueue_inode_info *) foo;
 
@@ -314,15 +314,11 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry)
 *       through std routines)
 */
 static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
-                                size_t count, loff_t * off)
+                                size_t count, loff_t *off)
 {
         struct mqueue_inode_info *info = MQUEUE_I(filp->f_path.dentry->d_inode);
         char buffer[FILENT_SIZE];
-        size_t slen;
-        loff_t o;
-
-        if (!count)
-                return 0;
+        ssize_t ret;
 
         spin_lock(&info->lock);
         snprintf(buffer, sizeof(buffer),
@@ -335,21 +331,14 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
                         pid_vnr(info->notify_owner));
         spin_unlock(&info->lock);
         buffer[sizeof(buffer)-1] = '\0';
-        slen = strlen(buffer)+1;
-
-        o = *off;
-        if (o > slen)
-                return 0;
-
-        if (o + count > slen)
-                count = slen - o;
 
-        if (copy_to_user(u_data, buffer + o, count))
-                return -EFAULT;
+        ret = simple_read_from_buffer(u_data, count, off, buffer,
+                                strlen(buffer));
+        if (ret <= 0)
+                return ret;
 
-        *off = o + count;
         filp->f_path.dentry->d_inode->i_atime = filp->f_path.dentry->d_inode->i_ctime = CURRENT_TIME;
-        return count;
+        return ret;
 }
 
 static int mqueue_flush_file(struct file *filp, fl_owner_t id)
@@ -649,7 +638,7 @@ static int oflag2acc[O_ACCMODE] = { MAY_READ, MAY_WRITE,
                 return ERR_PTR(-EINVAL);
         }
 
-        if (permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE], NULL)) {
+        if (inode_permission(dentry->d_inode, oflag2acc[oflag & O_ACCMODE])) {
                 dput(dentry);
                 mntput(mqueue_mnt);
                 return ERR_PTR(-EACCES);
@@ -1054,7 +1043,7 @@ retry:
                         }
 
                         timeo = MAX_SCHEDULE_TIMEOUT;
-                        ret = netlink_attachskb(sock, nc, 0, &timeo, NULL);
+                        ret = netlink_attachskb(sock, nc, &timeo, NULL);
                         if (ret == 1)
                                 goto retry;
                         if (ret) {