diff options
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r-- | ipc/mqueue.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 3acc1661e517..02717f71d8d0 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -322,7 +322,7 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry) | |||
322 | static ssize_t mqueue_read_file(struct file *filp, char __user *u_data, | 322 | static ssize_t mqueue_read_file(struct file *filp, char __user *u_data, |
323 | size_t count, loff_t * off) | 323 | size_t count, loff_t * off) |
324 | { | 324 | { |
325 | struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode); | 325 | struct mqueue_inode_info *info = MQUEUE_I(filp->f_path.dentry->d_inode); |
326 | char buffer[FILENT_SIZE]; | 326 | char buffer[FILENT_SIZE]; |
327 | size_t slen; | 327 | size_t slen; |
328 | loff_t o; | 328 | loff_t o; |
@@ -354,13 +354,13 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data, | |||
354 | return -EFAULT; | 354 | return -EFAULT; |
355 | 355 | ||
356 | *off = o + count; | 356 | *off = o + count; |
357 | filp->f_dentry->d_inode->i_atime = filp->f_dentry->d_inode->i_ctime = CURRENT_TIME; | 357 | filp->f_path.dentry->d_inode->i_atime = filp->f_path.dentry->d_inode->i_ctime = CURRENT_TIME; |
358 | return count; | 358 | return count; |
359 | } | 359 | } |
360 | 360 | ||
361 | static int mqueue_flush_file(struct file *filp, fl_owner_t id) | 361 | static int mqueue_flush_file(struct file *filp, fl_owner_t id) |
362 | { | 362 | { |
363 | struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode); | 363 | struct mqueue_inode_info *info = MQUEUE_I(filp->f_path.dentry->d_inode); |
364 | 364 | ||
365 | spin_lock(&info->lock); | 365 | spin_lock(&info->lock); |
366 | if (task_tgid(current) == info->notify_owner) | 366 | if (task_tgid(current) == info->notify_owner) |
@@ -372,7 +372,7 @@ static int mqueue_flush_file(struct file *filp, fl_owner_t id) | |||
372 | 372 | ||
373 | static unsigned int mqueue_poll_file(struct file *filp, struct poll_table_struct *poll_tab) | 373 | static unsigned int mqueue_poll_file(struct file *filp, struct poll_table_struct *poll_tab) |
374 | { | 374 | { |
375 | struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode); | 375 | struct mqueue_inode_info *info = MQUEUE_I(filp->f_path.dentry->d_inode); |
376 | int retval = 0; | 376 | int retval = 0; |
377 | 377 | ||
378 | poll_wait(filp, &info->wait_q, poll_tab); | 378 | poll_wait(filp, &info->wait_q, poll_tab); |
@@ -836,7 +836,7 @@ asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr, | |||
836 | if (unlikely(!filp)) | 836 | if (unlikely(!filp)) |
837 | goto out; | 837 | goto out; |
838 | 838 | ||
839 | inode = filp->f_dentry->d_inode; | 839 | inode = filp->f_path.dentry->d_inode; |
840 | if (unlikely(filp->f_op != &mqueue_file_operations)) | 840 | if (unlikely(filp->f_op != &mqueue_file_operations)) |
841 | goto out_fput; | 841 | goto out_fput; |
842 | info = MQUEUE_I(inode); | 842 | info = MQUEUE_I(inode); |
@@ -919,7 +919,7 @@ asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr, | |||
919 | if (unlikely(!filp)) | 919 | if (unlikely(!filp)) |
920 | goto out; | 920 | goto out; |
921 | 921 | ||
922 | inode = filp->f_dentry->d_inode; | 922 | inode = filp->f_path.dentry->d_inode; |
923 | if (unlikely(filp->f_op != &mqueue_file_operations)) | 923 | if (unlikely(filp->f_op != &mqueue_file_operations)) |
924 | goto out_fput; | 924 | goto out_fput; |
925 | info = MQUEUE_I(inode); | 925 | info = MQUEUE_I(inode); |
@@ -1056,7 +1056,7 @@ retry: | |||
1056 | if (!filp) | 1056 | if (!filp) |
1057 | goto out; | 1057 | goto out; |
1058 | 1058 | ||
1059 | inode = filp->f_dentry->d_inode; | 1059 | inode = filp->f_path.dentry->d_inode; |
1060 | if (unlikely(filp->f_op != &mqueue_file_operations)) | 1060 | if (unlikely(filp->f_op != &mqueue_file_operations)) |
1061 | goto out_fput; | 1061 | goto out_fput; |
1062 | info = MQUEUE_I(inode); | 1062 | info = MQUEUE_I(inode); |
@@ -1126,7 +1126,7 @@ asmlinkage long sys_mq_getsetattr(mqd_t mqdes, | |||
1126 | if (!filp) | 1126 | if (!filp) |
1127 | goto out; | 1127 | goto out; |
1128 | 1128 | ||
1129 | inode = filp->f_dentry->d_inode; | 1129 | inode = filp->f_path.dentry->d_inode; |
1130 | if (unlikely(filp->f_op != &mqueue_file_operations)) | 1130 | if (unlikely(filp->f_op != &mqueue_file_operations)) |
1131 | goto out_fput; | 1131 | goto out_fput; |
1132 | info = MQUEUE_I(inode); | 1132 | info = MQUEUE_I(inode); |