[PATCH] struct path: convert ipc
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
1cfd6e648b
commit
6d63079add
16
ipc/mqueue.c
16
ipc/mqueue.c
@@ -322,7 +322,7 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry)
|
||||
static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
|
||||
size_t count, loff_t * off)
|
||||
{
|
||||
struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode);
|
||||
struct mqueue_inode_info *info = MQUEUE_I(filp->f_path.dentry->d_inode);
|
||||
char buffer[FILENT_SIZE];
|
||||
size_t slen;
|
||||
loff_t o;
|
||||
@@ -354,13 +354,13 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
|
||||
return -EFAULT;
|
||||
|
||||
*off = o + count;
|
||||
filp->f_dentry->d_inode->i_atime = filp->f_dentry->d_inode->i_ctime = CURRENT_TIME;
|
||||
filp->f_path.dentry->d_inode->i_atime = filp->f_path.dentry->d_inode->i_ctime = CURRENT_TIME;
|
||||
return count;
|
||||
}
|
||||
|
||||
static int mqueue_flush_file(struct file *filp, fl_owner_t id)
|
||||
{
|
||||
struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode);
|
||||
struct mqueue_inode_info *info = MQUEUE_I(filp->f_path.dentry->d_inode);
|
||||
|
||||
spin_lock(&info->lock);
|
||||
if (task_tgid(current) == info->notify_owner)
|
||||
@@ -372,7 +372,7 @@ static int mqueue_flush_file(struct file *filp, fl_owner_t id)
|
||||
|
||||
static unsigned int mqueue_poll_file(struct file *filp, struct poll_table_struct *poll_tab)
|
||||
{
|
||||
struct mqueue_inode_info *info = MQUEUE_I(filp->f_dentry->d_inode);
|
||||
struct mqueue_inode_info *info = MQUEUE_I(filp->f_path.dentry->d_inode);
|
||||
int retval = 0;
|
||||
|
||||
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,
|
||||
if (unlikely(!filp))
|
||||
goto out;
|
||||
|
||||
inode = filp->f_dentry->d_inode;
|
||||
inode = filp->f_path.dentry->d_inode;
|
||||
if (unlikely(filp->f_op != &mqueue_file_operations))
|
||||
goto out_fput;
|
||||
info = MQUEUE_I(inode);
|
||||
@@ -919,7 +919,7 @@ asmlinkage ssize_t sys_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr,
|
||||
if (unlikely(!filp))
|
||||
goto out;
|
||||
|
||||
inode = filp->f_dentry->d_inode;
|
||||
inode = filp->f_path.dentry->d_inode;
|
||||
if (unlikely(filp->f_op != &mqueue_file_operations))
|
||||
goto out_fput;
|
||||
info = MQUEUE_I(inode);
|
||||
@@ -1056,7 +1056,7 @@ retry:
|
||||
if (!filp)
|
||||
goto out;
|
||||
|
||||
inode = filp->f_dentry->d_inode;
|
||||
inode = filp->f_path.dentry->d_inode;
|
||||
if (unlikely(filp->f_op != &mqueue_file_operations))
|
||||
goto out_fput;
|
||||
info = MQUEUE_I(inode);
|
||||
@@ -1126,7 +1126,7 @@ asmlinkage long sys_mq_getsetattr(mqd_t mqdes,
|
||||
if (!filp)
|
||||
goto out;
|
||||
|
||||
inode = filp->f_dentry->d_inode;
|
||||
inode = filp->f_path.dentry->d_inode;
|
||||
if (unlikely(filp->f_op != &mqueue_file_operations))
|
||||
goto out_fput;
|
||||
info = MQUEUE_I(inode);
|
||||
|
Reference in New Issue
Block a user