Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

[sfrench/cifs-2.6.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index d17821d3f4835a646a8a6977e9491f0ed09d1ea4..20f1fed8fa48f65f206eeb3124b56d602da3ca80 100644 (file)
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -44,12 +44,6 @@
 #define STATE_PENDING  1
 #define STATE_READY    2
 
-/* used by sysctl */
-#define FS_MQUEUE      1
-#define CTL_QUEUESMAX  2
-#define CTL_MSGMAX     3
-#define CTL_MSGSIZEMAX         4
-
 /* default values */
 #define DFLT_QUEUESMAX 256     /* max number of message queues */
 #define DFLT_MSGMAX    10      /* max number of messages in each queue */
@@ -211,12 +205,11 @@ 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(void *foo, struct kmem_cache * cachep, unsigned long flags)
+static void init_once(struct kmem_cache *cachep, void *foo)
 {
        struct mqueue_inode_info *p = (struct mqueue_inode_info *) foo;
 
-       if (flags & SLAB_CTOR_CONSTRUCTOR)
-               inode_init_once(&p->vfs_inode);
+       inode_init_once(&p->vfs_inode);
 }
 
 static struct inode *mqueue_alloc_inode(struct super_block *sb)
@@ -522,8 +515,7 @@ static void __do_notify(struct mqueue_inode_info *info)
                        break;
                case SIGEV_THREAD:
                        set_cookie(info->notify_cookie, NOTIFY_WOKENUP);
-                       netlink_sendskb(info->notify_sock,
-                                       info->notify_cookie, 0);
+                       netlink_sendskb(info->notify_sock, info->notify_cookie);
                        break;
                }
                /* after notification unregisters process */
@@ -569,7 +561,7 @@ static void remove_notification(struct mqueue_inode_info *info)
        if (info->notify_owner != NULL &&
            info->notify.sigev_notify == SIGEV_THREAD) {
                set_cookie(info->notify_cookie, NOTIFY_REMOVED);
-               netlink_sendskb(info->notify_sock, info->notify_cookie, 0);
+               netlink_sendskb(info->notify_sock, info->notify_cookie);
        }
        put_pid(info->notify_owner);
        info->notify_owner = NULL;
@@ -681,6 +673,7 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
 
        if (oflag & O_CREAT) {
                if (dentry->d_inode) {  /* entry already exists */
+                       audit_inode(name, dentry->d_inode);
                        error = -EEXIST;
                        if (oflag & O_EXCL)
                                goto out;
@@ -693,6 +686,7 @@ asmlinkage long sys_mq_open(const char __user *u_name, int oflag, mode_t mode,
                error = -ENOENT;
                if (!dentry->d_inode)
                        goto out;
+               audit_inode(name, dentry->d_inode);
                filp = do_open(dentry, oflag);
        }
 
@@ -840,6 +834,7 @@ asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr,
        if (unlikely(filp->f_op != &mqueue_file_operations))
                goto out_fput;
        info = MQUEUE_I(inode);
+       audit_inode(NULL, inode);
 
        if (unlikely(!(filp->f_mode & FMODE_WRITE)))
                goto out_fput;
@@ -923,6 +918,7 @@ asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
        if (unlikely(filp->f_op != &mqueue_file_operations))
                goto out_fput;
        info = MQUEUE_I(inode);
+       audit_inode(NULL, inode);
 
        if (unlikely(!(filp->f_mode & FMODE_READ)))
                goto out_fput;
@@ -1194,7 +1190,6 @@ static int msg_maxsize_limit_max = INT_MAX;
 
 static ctl_table mq_sysctls[] = {
        {
-               .ctl_name       = CTL_QUEUESMAX,
                .procname       = "queues_max",
                .data           = &queues_max,
                .maxlen         = sizeof(int),
@@ -1202,7 +1197,6 @@ static ctl_table mq_sysctls[] = {
                .proc_handler   = &proc_dointvec,
        },
        {
-               .ctl_name       = CTL_MSGMAX,
                .procname       = "msg_max",
                .data           = &msg_max,
                .maxlen         = sizeof(int),
@@ -1212,7 +1206,6 @@ static ctl_table mq_sysctls[] = {
                .extra2         = &msg_max_limit_max,
        },
        {
-               .ctl_name       = CTL_MSGSIZEMAX,
                .procname       = "msgsize_max",
                .data           = &msgsize_max,
                .maxlen         = sizeof(int),
@@ -1226,7 +1219,6 @@ static ctl_table mq_sysctls[] = {
 
 static ctl_table mq_sysctl_dir[] = {
        {
-               .ctl_name       = FS_MQUEUE,
                .procname       = "mqueue",
                .mode           = 0555,
                .child          = mq_sysctls,
@@ -1250,7 +1242,7 @@ static int __init init_mqueue_fs(void)
 
        mqueue_inode_cachep = kmem_cache_create("mqueue_inode_cache",
                                sizeof(struct mqueue_inode_info), 0,
-                               SLAB_HWCACHE_ALIGN, init_once, NULL);
+                               SLAB_HWCACHE_ALIGN, init_once);
        if (mqueue_inode_cachep == NULL)
                return -ENOMEM;