diff options
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r-- | ipc/mqueue.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 95827ce2f3c7..c3b31179122c 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com) | 7 | * Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com) |
8 | * Lockless receive & send, fd based notify: | 8 | * Lockless receive & send, fd based notify: |
9 | * Manfred Spraul (manfred@colorfullife.com) | 9 | * Manfred Spraul (manfred@colorfullife.com) |
10 | * | 10 | * |
11 | * Audit: George Wilson (ltcgcw@us.ibm.com) | 11 | * Audit: George Wilson (ltcgcw@us.ibm.com) |
12 | * | 12 | * |
@@ -73,7 +73,7 @@ struct mqueue_inode_info { | |||
73 | struct mq_attr attr; | 73 | struct mq_attr attr; |
74 | 74 | ||
75 | struct sigevent notify; | 75 | struct sigevent notify; |
76 | struct pid* notify_owner; | 76 | struct pid *notify_owner; |
77 | struct user_namespace *notify_user_ns; | 77 | struct user_namespace *notify_user_ns; |
78 | struct user_struct *user; /* user who created, for accounting */ | 78 | struct user_struct *user; /* user who created, for accounting */ |
79 | struct sock *notify_sock; | 79 | struct sock *notify_sock; |
@@ -92,7 +92,7 @@ static void remove_notification(struct mqueue_inode_info *info); | |||
92 | 92 | ||
93 | static struct kmem_cache *mqueue_inode_cachep; | 93 | static struct kmem_cache *mqueue_inode_cachep; |
94 | 94 | ||
95 | static struct ctl_table_header * mq_sysctl_table; | 95 | static struct ctl_table_header *mq_sysctl_table; |
96 | 96 | ||
97 | static inline struct mqueue_inode_info *MQUEUE_I(struct inode *inode) | 97 | static inline struct mqueue_inode_info *MQUEUE_I(struct inode *inode) |
98 | { | 98 | { |
@@ -433,9 +433,9 @@ static int mqueue_create(struct inode *dir, struct dentry *dentry, | |||
433 | error = -EACCES; | 433 | error = -EACCES; |
434 | goto out_unlock; | 434 | goto out_unlock; |
435 | } | 435 | } |
436 | if (ipc_ns->mq_queues_count >= HARD_QUEUESMAX || | 436 | |
437 | (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max && | 437 | if (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max && |
438 | !capable(CAP_SYS_RESOURCE))) { | 438 | !capable(CAP_SYS_RESOURCE)) { |
439 | error = -ENOSPC; | 439 | error = -ENOSPC; |
440 | goto out_unlock; | 440 | goto out_unlock; |
441 | } | 441 | } |
@@ -466,13 +466,13 @@ out_unlock: | |||
466 | 466 | ||
467 | static int mqueue_unlink(struct inode *dir, struct dentry *dentry) | 467 | static int mqueue_unlink(struct inode *dir, struct dentry *dentry) |
468 | { | 468 | { |
469 | struct inode *inode = dentry->d_inode; | 469 | struct inode *inode = dentry->d_inode; |
470 | 470 | ||
471 | dir->i_ctime = dir->i_mtime = dir->i_atime = CURRENT_TIME; | 471 | dir->i_ctime = dir->i_mtime = dir->i_atime = CURRENT_TIME; |
472 | dir->i_size -= DIRENT_SIZE; | 472 | dir->i_size -= DIRENT_SIZE; |
473 | drop_nlink(inode); | 473 | drop_nlink(inode); |
474 | dput(dentry); | 474 | dput(dentry); |
475 | return 0; | 475 | return 0; |
476 | } | 476 | } |
477 | 477 | ||
478 | /* | 478 | /* |
@@ -622,7 +622,7 @@ static struct ext_wait_queue *wq_get_first_waiter( | |||
622 | 622 | ||
623 | static inline void set_cookie(struct sk_buff *skb, char code) | 623 | static inline void set_cookie(struct sk_buff *skb, char code) |
624 | { | 624 | { |
625 | ((char*)skb->data)[NOTIFY_COOKIE_LEN-1] = code; | 625 | ((char *)skb->data)[NOTIFY_COOKIE_LEN-1] = code; |
626 | } | 626 | } |
627 | 627 | ||
628 | /* | 628 | /* |
@@ -1303,11 +1303,11 @@ retry: | |||
1303 | out_fput: | 1303 | out_fput: |
1304 | fdput(f); | 1304 | fdput(f); |
1305 | out: | 1305 | out: |
1306 | if (sock) { | 1306 | if (sock) |
1307 | netlink_detachskb(sock, nc); | 1307 | netlink_detachskb(sock, nc); |
1308 | } else if (nc) { | 1308 | else if (nc) |
1309 | dev_kfree_skb(nc); | 1309 | dev_kfree_skb(nc); |
1310 | } | 1310 | |
1311 | return ret; | 1311 | return ret; |
1312 | } | 1312 | } |
1313 | 1313 | ||