more open-coded file_inode() calls
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
0b3fca1fd1
Коммит
e77e430033
|
@ -101,7 +101,7 @@ static void show_faulting_vma(unsigned long address, char *buf)
|
|||
if (file) {
|
||||
struct path *path = &file->f_path;
|
||||
nm = d_path(path, buf, PAGE_SIZE - 1);
|
||||
inode = vma->vm_file->f_path.dentry->d_inode;
|
||||
inode = file_inode(vma->vm_file);
|
||||
dev = inode->i_sb->s_dev;
|
||||
ino = inode->i_ino;
|
||||
}
|
||||
|
|
|
@ -696,7 +696,7 @@ static long logger_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
|||
ret = -EBADF;
|
||||
break;
|
||||
}
|
||||
if (!(in_egroup_p(file->f_dentry->d_inode->i_gid) ||
|
||||
if (!(in_egroup_p(file_inode(file)->i_gid) ||
|
||||
capable(CAP_SYSLOG))) {
|
||||
ret = -EPERM;
|
||||
break;
|
||||
|
|
|
@ -1330,7 +1330,7 @@ static int wait_for_gss_proxy(struct net *net, struct file *file)
|
|||
static ssize_t write_gssp(struct file *file, const char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct net *net = PDE_DATA(file->f_path.dentry->d_inode);
|
||||
struct net *net = PDE_DATA(file_inode(file));
|
||||
char tbuf[20];
|
||||
unsigned long i;
|
||||
int res;
|
||||
|
@ -1358,7 +1358,7 @@ static ssize_t write_gssp(struct file *file, const char __user *buf,
|
|||
static ssize_t read_gssp(struct file *file, char __user *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct net *net = PDE_DATA(file->f_path.dentry->d_inode);
|
||||
struct net *net = PDE_DATA(file_inode(file));
|
||||
unsigned long p = *ppos;
|
||||
char tbuf[10];
|
||||
size_t len;
|
||||
|
|
Загрузка…
Ссылка в новой задаче