new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -273,7 +273,7 @@ static inline int autofs_prepare_pipe(struct file *pipe)
|
||||
{
|
||||
if (!pipe->f_op || !pipe->f_op->write)
|
||||
return -EINVAL;
|
||||
if (!S_ISFIFO(pipe->f_dentry->d_inode->i_mode))
|
||||
if (!S_ISFIFO(file_inode(pipe)->i_mode))
|
||||
return -EINVAL;
|
||||
/* We want a packet pipe */
|
||||
pipe->f_flags |= O_DIRECT;
|
||||
|
@@ -159,7 +159,7 @@ static struct autofs_sb_info *autofs_dev_ioctl_sbi(struct file *f)
|
||||
struct inode *inode;
|
||||
|
||||
if (f) {
|
||||
inode = f->f_path.dentry->d_inode;
|
||||
inode = file_inode(f);
|
||||
sbi = autofs4_sbi(inode->i_sb);
|
||||
}
|
||||
return sbi;
|
||||
|
@@ -874,7 +874,7 @@ static int autofs4_root_ioctl_unlocked(struct inode *inode, struct file *filp,
|
||||
static long autofs4_root_ioctl(struct file *filp,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct inode *inode = filp->f_dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
return autofs4_root_ioctl_unlocked(inode, filp, cmd, arg);
|
||||
}
|
||||
|
||||
@@ -882,7 +882,7 @@ static long autofs4_root_ioctl(struct file *filp,
|
||||
static long autofs4_root_compat_ioctl(struct file *filp,
|
||||
unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct inode *inode = filp->f_path.dentry->d_inode;
|
||||
struct inode *inode = file_inode(filp);
|
||||
int ret;
|
||||
|
||||
if (cmd == AUTOFS_IOC_READY || cmd == AUTOFS_IOC_FAIL)
|
||||
|
Reference in New Issue
Block a user