diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-10 14:35:36 -0500 |
| commit | 4ba24fef3eb3b142197135223b90ced2f319cd53 (patch) | |
| tree | a20c125b27740ec7b4c761b11d801108e1b316b2 /ipc/mqueue.c | |
| parent | 47c1ffb2b6b630894e9a16442611c056ab21c057 (diff) | |
| parent | 98a4a59ee31a12105a2b84f5b8b515ac2cb208ef (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.20.
Diffstat (limited to 'ipc/mqueue.c')
| -rw-r--r-- | ipc/mqueue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 4fcf39af1776..7635a1cf99f3 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
| @@ -990,7 +990,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, | |||
| 990 | goto out_fput; | 990 | goto out_fput; |
| 991 | } | 991 | } |
| 992 | info = MQUEUE_I(inode); | 992 | info = MQUEUE_I(inode); |
| 993 | audit_inode(NULL, f.file->f_path.dentry, 0); | 993 | audit_file(f.file); |
| 994 | 994 | ||
| 995 | if (unlikely(!(f.file->f_mode & FMODE_WRITE))) { | 995 | if (unlikely(!(f.file->f_mode & FMODE_WRITE))) { |
| 996 | ret = -EBADF; | 996 | ret = -EBADF; |
| @@ -1106,7 +1106,7 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, | |||
| 1106 | goto out_fput; | 1106 | goto out_fput; |
| 1107 | } | 1107 | } |
| 1108 | info = MQUEUE_I(inode); | 1108 | info = MQUEUE_I(inode); |
| 1109 | audit_inode(NULL, f.file->f_path.dentry, 0); | 1109 | audit_file(f.file); |
| 1110 | 1110 | ||
| 1111 | if (unlikely(!(f.file->f_mode & FMODE_READ))) { | 1111 | if (unlikely(!(f.file->f_mode & FMODE_READ))) { |
| 1112 | ret = -EBADF; | 1112 | ret = -EBADF; |