don't open-code file_inode()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
@@ -548,8 +548,8 @@ int audit_exe_compare(struct task_struct *tsk, struct audit_fsnotify_mark *mark)
|
||||
exe_file = get_task_exe_file(tsk);
|
||||
if (!exe_file)
|
||||
return 0;
|
||||
ino = exe_file->f_inode->i_ino;
|
||||
dev = exe_file->f_inode->i_sb->s_dev;
|
||||
ino = file_inode(exe_file)->i_ino;
|
||||
dev = file_inode(exe_file)->i_sb->s_dev;
|
||||
fput(exe_file);
|
||||
return audit_mark_compare(mark, ino, dev);
|
||||
}
|
||||
|
||||
@@ -6701,7 +6701,7 @@ static bool perf_addr_filter_match(struct perf_addr_filter *filter,
|
||||
struct file *file, unsigned long offset,
|
||||
unsigned long size)
|
||||
{
|
||||
if (filter->inode != file->f_inode)
|
||||
if (filter->inode != file_inode(file))
|
||||
return false;
|
||||
|
||||
if (filter->offset > offset + size)
|
||||
|
||||
@@ -108,11 +108,7 @@ static ssize_t qstat_read(struct file *file, char __user *user_buf,
|
||||
/*
|
||||
* Get the counter ID stored in file->f_inode->i_private
|
||||
*/
|
||||
if (!file->f_inode) {
|
||||
WARN_ON_ONCE(1);
|
||||
return -EBADF;
|
||||
}
|
||||
counter = (long)(file->f_inode->i_private);
|
||||
counter = (long)file_inode(file)->i_private;
|
||||
|
||||
if (counter >= qstat_num)
|
||||
return -EBADF;
|
||||
@@ -177,11 +173,7 @@ static ssize_t qstat_write(struct file *file, const char __user *user_buf,
|
||||
/*
|
||||
* Get the counter ID stored in file->f_inode->i_private
|
||||
*/
|
||||
if (!file->f_inode) {
|
||||
WARN_ON_ONCE(1);
|
||||
return -EBADF;
|
||||
}
|
||||
if ((long)(file->f_inode->i_private) != qstat_reset_cnts)
|
||||
if ((long)file_inode(file)->i_private != qstat_reset_cnts)
|
||||
return count;
|
||||
|
||||
for_each_possible_cpu(cpu) {
|
||||
|
||||
Reference in New Issue
Block a user