Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FengXiao2002
Linux Imx
提交
6131ffaa
L
Linux Imx
项目概览
FengXiao2002
/
Linux Imx
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
Linux Imx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6131ffaa
编写于
2月 27, 2013
作者:
A
Al Viro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
more file_inode() open-coded instances
Signed-off-by:
N
Al Viro
<
viro@zeniv.linux.org.uk
>
上级
45e09bd5
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
38 addition
and
45 deletion
+38
-45
arch/s390/hypfs/inode.c
arch/s390/hypfs/inode.c
+2
-4
arch/x86/kernel/msr.c
arch/x86/kernel/msr.c
+4
-5
drivers/staging/comedi/comedi_fops.c
drivers/staging/comedi/comedi_fops.c
+7
-7
drivers/tty/tty_io.c
drivers/tty/tty_io.c
+6
-10
fs/ext4/indirect.c
fs/ext4/indirect.c
+1
-1
fs/f2fs/file.c
fs/f2fs/file.c
+3
-3
fs/fuse/dev.c
fs/fuse/dev.c
+1
-1
fs/fuse/file.c
fs/fuse/file.c
+12
-12
fs/seq_file.c
fs/seq_file.c
+1
-1
kernel/futex.c
kernel/futex.c
+1
-1
未找到文件。
arch/s390/hypfs/inode.c
浏览文件 @
6131ffaa
...
...
@@ -171,12 +171,10 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov,
unsigned
long
nr_segs
,
loff_t
offset
)
{
int
rc
;
struct
super_block
*
sb
;
struct
hypfs_sb_info
*
fs_info
;
struct
super_block
*
sb
=
file_inode
(
iocb
->
ki_filp
)
->
i_sb
;
struct
hypfs_sb_info
*
fs_info
=
sb
->
s_fs_info
;
size_t
count
=
iov_length
(
iov
,
nr_segs
);
sb
=
iocb
->
ki_filp
->
f_path
.
dentry
->
d_inode
->
i_sb
;
fs_info
=
sb
->
s_fs_info
;
/*
* Currently we only allow one update per second for two reasons:
* 1. diag 204 is VERY expensive
...
...
arch/x86/kernel/msr.c
浏览文件 @
6131ffaa
...
...
@@ -71,7 +71,7 @@ static ssize_t msr_read(struct file *file, char __user *buf,
u32
__user
*
tmp
=
(
u32
__user
*
)
buf
;
u32
data
[
2
];
u32
reg
=
*
ppos
;
int
cpu
=
iminor
(
file
->
f_path
.
dentry
->
d_inode
);
int
cpu
=
iminor
(
file
_inode
(
file
)
);
int
err
=
0
;
ssize_t
bytes
=
0
;
...
...
@@ -99,7 +99,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
const
u32
__user
*
tmp
=
(
const
u32
__user
*
)
buf
;
u32
data
[
2
];
u32
reg
=
*
ppos
;
int
cpu
=
iminor
(
file
->
f_path
.
dentry
->
d_inode
);
int
cpu
=
iminor
(
file
_inode
(
file
)
);
int
err
=
0
;
ssize_t
bytes
=
0
;
...
...
@@ -125,7 +125,7 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
{
u32
__user
*
uregs
=
(
u32
__user
*
)
arg
;
u32
regs
[
8
];
int
cpu
=
iminor
(
file
->
f_path
.
dentry
->
d_inode
);
int
cpu
=
iminor
(
file
_inode
(
file
)
);
int
err
;
switch
(
ioc
)
{
...
...
@@ -171,13 +171,12 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
static
int
msr_open
(
struct
inode
*
inode
,
struct
file
*
file
)
{
unsigned
int
cpu
;
unsigned
int
cpu
=
iminor
(
file_inode
(
file
))
;
struct
cpuinfo_x86
*
c
;
if
(
!
capable
(
CAP_SYS_RAWIO
))
return
-
EPERM
;
cpu
=
iminor
(
file
->
f_path
.
dentry
->
d_inode
);
if
(
cpu
>=
nr_cpu_ids
||
!
cpu_online
(
cpu
))
return
-
ENXIO
;
/* No such CPU */
...
...
drivers/staging/comedi/comedi_fops.c
浏览文件 @
6131ffaa
...
...
@@ -580,7 +580,7 @@ static int do_devinfo_ioctl(struct comedi_device *dev,
struct
comedi_devinfo
__user
*
arg
,
struct
file
*
file
)
{
const
unsigned
minor
=
iminor
(
file
->
f_dentry
->
d_inode
);
const
unsigned
minor
=
iminor
(
file
_inode
(
file
)
);
struct
comedi_file_info
*
info
=
comedi_file_info_from_minor
(
minor
);
struct
comedi_subdevice
*
s
;
struct
comedi_devinfo
devinfo
;
...
...
@@ -1615,7 +1615,7 @@ static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg,
static
long
comedi_unlocked_ioctl
(
struct
file
*
file
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
const
unsigned
minor
=
iminor
(
file
->
f_dentry
->
d_inode
);
const
unsigned
minor
=
iminor
(
file
_inode
(
file
)
);
struct
comedi_file_info
*
info
=
comedi_file_info_from_minor
(
minor
);
struct
comedi_device
*
dev
=
comedi_dev_from_file_info
(
info
);
int
rc
;
...
...
@@ -1743,7 +1743,7 @@ static struct vm_operations_struct comedi_vm_ops = {
static
int
comedi_mmap
(
struct
file
*
file
,
struct
vm_area_struct
*
vma
)
{
const
unsigned
minor
=
iminor
(
file
->
f_dentry
->
d_inode
);
const
unsigned
minor
=
iminor
(
file
_inode
(
file
)
);
struct
comedi_file_info
*
info
=
comedi_file_info_from_minor
(
minor
);
struct
comedi_device
*
dev
=
comedi_dev_from_file_info
(
info
);
struct
comedi_subdevice
*
s
;
...
...
@@ -1823,7 +1823,7 @@ done:
static
unsigned
int
comedi_poll
(
struct
file
*
file
,
poll_table
*
wait
)
{
unsigned
int
mask
=
0
;
const
unsigned
minor
=
iminor
(
file
->
f_dentry
->
d_inode
);
const
unsigned
minor
=
iminor
(
file
_inode
(
file
)
);
struct
comedi_file_info
*
info
=
comedi_file_info_from_minor
(
minor
);
struct
comedi_device
*
dev
=
comedi_dev_from_file_info
(
info
);
struct
comedi_subdevice
*
s
;
...
...
@@ -1869,7 +1869,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
struct
comedi_async
*
async
;
int
n
,
m
,
count
=
0
,
retval
=
0
;
DECLARE_WAITQUEUE
(
wait
,
current
);
const
unsigned
minor
=
iminor
(
file
->
f_dentry
->
d_inode
);
const
unsigned
minor
=
iminor
(
file
_inode
(
file
)
);
struct
comedi_file_info
*
info
=
comedi_file_info_from_minor
(
minor
);
struct
comedi_device
*
dev
=
comedi_dev_from_file_info
(
info
);
...
...
@@ -1964,7 +1964,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
struct
comedi_async
*
async
;
int
n
,
m
,
count
=
0
,
retval
=
0
;
DECLARE_WAITQUEUE
(
wait
,
current
);
const
unsigned
minor
=
iminor
(
file
->
f_dentry
->
d_inode
);
const
unsigned
minor
=
iminor
(
file
_inode
(
file
)
);
struct
comedi_file_info
*
info
=
comedi_file_info_from_minor
(
minor
);
struct
comedi_device
*
dev
=
comedi_dev_from_file_info
(
info
);
...
...
@@ -2133,7 +2133,7 @@ ok:
static
int
comedi_fasync
(
int
fd
,
struct
file
*
file
,
int
on
)
{
const
unsigned
minor
=
iminor
(
file
->
f_dentry
->
d_inode
);
const
unsigned
minor
=
iminor
(
file
_inode
(
file
)
);
struct
comedi_device
*
dev
=
comedi_dev_from_minor
(
minor
);
if
(
!
dev
)
...
...
drivers/tty/tty_io.c
浏览文件 @
6131ffaa
...
...
@@ -960,11 +960,10 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
loff_t
*
ppos
)
{
int
i
;
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
tty_struct
*
tty
=
file_tty
(
file
);
struct
tty_ldisc
*
ld
;
if
(
tty_paranoia_check
(
tty
,
inode
,
"tty_read"
))
if
(
tty_paranoia_check
(
tty
,
file_inode
(
file
)
,
"tty_read"
))
return
-
EIO
;
if
(
!
tty
||
(
test_bit
(
TTY_IO_ERROR
,
&
tty
->
flags
)))
return
-
EIO
;
...
...
@@ -1132,12 +1131,11 @@ void tty_write_message(struct tty_struct *tty, char *msg)
static
ssize_t
tty_write
(
struct
file
*
file
,
const
char
__user
*
buf
,
size_t
count
,
loff_t
*
ppos
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
tty_struct
*
tty
=
file_tty
(
file
);
struct
tty_ldisc
*
ld
;
ssize_t
ret
;
if
(
tty_paranoia_check
(
tty
,
inode
,
"tty_write"
))
if
(
tty_paranoia_check
(
tty
,
file_inode
(
file
)
,
"tty_write"
))
return
-
EIO
;
if
(
!
tty
||
!
tty
->
ops
->
write
||
(
test_bit
(
TTY_IO_ERROR
,
&
tty
->
flags
)))
...
...
@@ -2047,7 +2045,7 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait)
struct
tty_ldisc
*
ld
;
int
ret
=
0
;
if
(
tty_paranoia_check
(
tty
,
fil
p
->
f_path
.
dentry
->
d_inode
,
"tty_poll"
))
if
(
tty_paranoia_check
(
tty
,
fil
e_inode
(
filp
)
,
"tty_poll"
))
return
0
;
ld
=
tty_ldisc_ref_wait
(
tty
);
...
...
@@ -2063,7 +2061,7 @@ static int __tty_fasync(int fd, struct file *filp, int on)
unsigned
long
flags
;
int
retval
=
0
;
if
(
tty_paranoia_check
(
tty
,
fil
p
->
f_path
.
dentry
->
d_inode
,
"tty_fasync"
))
if
(
tty_paranoia_check
(
tty
,
fil
e_inode
(
filp
)
,
"tty_fasync"
))
goto
out
;
retval
=
fasync_helper
(
fd
,
filp
,
on
,
&
tty
->
fasync
);
...
...
@@ -2637,9 +2635,8 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
void
__user
*
p
=
(
void
__user
*
)
arg
;
int
retval
;
struct
tty_ldisc
*
ld
;
struct
inode
*
inode
=
file
->
f_dentry
->
d_inode
;
if
(
tty_paranoia_check
(
tty
,
inode
,
"tty_ioctl"
))
if
(
tty_paranoia_check
(
tty
,
file_inode
(
file
)
,
"tty_ioctl"
))
return
-
EINVAL
;
real_tty
=
tty_pair_get_tty
(
tty
);
...
...
@@ -2780,12 +2777,11 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
static
long
tty_compat_ioctl
(
struct
file
*
file
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
struct
inode
*
inode
=
file
->
f_dentry
->
d_inode
;
struct
tty_struct
*
tty
=
file_tty
(
file
);
struct
tty_ldisc
*
ld
;
int
retval
=
-
ENOIOCTLCMD
;
if
(
tty_paranoia_check
(
tty
,
inode
,
"tty_ioctl"
))
if
(
tty_paranoia_check
(
tty
,
file_inode
(
file
)
,
"tty_ioctl"
))
return
-
EINVAL
;
if
(
tty
->
ops
->
compat_ioctl
)
{
...
...
fs/ext4/indirect.c
浏览文件 @
6131ffaa
...
...
@@ -1606,7 +1606,7 @@ err:
int
ext4_ind_punch_hole
(
struct
file
*
file
,
loff_t
offset
,
loff_t
length
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
super_block
*
sb
=
inode
->
i_sb
;
ext4_lblk_t
first_block
,
stop_block
;
struct
address_space
*
mapping
=
inode
->
i_mapping
;
...
...
fs/f2fs/file.c
浏览文件 @
6131ffaa
...
...
@@ -29,7 +29,7 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
struct
vm_fault
*
vmf
)
{
struct
page
*
page
=
vmf
->
page
;
struct
inode
*
inode
=
vma
->
vm_file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file_inode
(
vma
->
vm_file
)
;
struct
f2fs_sb_info
*
sbi
=
F2FS_SB
(
inode
->
i_sb
);
block_t
old_blk_addr
;
struct
dnode_of_data
dn
;
...
...
@@ -544,7 +544,7 @@ static int expand_inode_data(struct inode *inode, loff_t offset,
static
long
f2fs_fallocate
(
struct
file
*
file
,
int
mode
,
loff_t
offset
,
loff_t
len
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
long
ret
;
if
(
mode
&
~
(
FALLOC_FL_KEEP_SIZE
|
FALLOC_FL_PUNCH_HOLE
))
...
...
@@ -577,7 +577,7 @@ static inline __u32 f2fs_mask_flags(umode_t mode, __u32 flags)
long
f2fs_ioctl
(
struct
file
*
filp
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
struct
inode
*
inode
=
fil
p
->
f_dentry
->
d_inode
;
struct
inode
*
inode
=
fil
e_inode
(
filp
)
;
struct
f2fs_inode_info
*
fi
=
F2FS_I
(
inode
);
unsigned
int
flags
;
int
ret
;
...
...
fs/fuse/dev.c
浏览文件 @
6131ffaa
...
...
@@ -532,7 +532,7 @@ void fuse_request_send_background_locked(struct fuse_conn *fc,
void
fuse_force_forget
(
struct
file
*
file
,
u64
nodeid
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
struct
fuse_req
*
req
;
struct
fuse_forget_in
inarg
;
...
...
fs/fuse/file.c
浏览文件 @
6131ffaa
...
...
@@ -355,7 +355,7 @@ static int fuse_wait_on_page_writeback(struct inode *inode, pgoff_t index)
static
int
fuse_flush
(
struct
file
*
file
,
fl_owner_t
id
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
struct
fuse_file
*
ff
=
file
->
private_data
;
struct
fuse_req
*
req
;
...
...
@@ -1215,7 +1215,7 @@ static ssize_t __fuse_direct_read(struct file *file, const struct iovec *iov,
unsigned
long
nr_segs
,
loff_t
*
ppos
)
{
ssize_t
res
;
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
if
(
is_bad_inode
(
inode
))
return
-
EIO
;
...
...
@@ -1238,7 +1238,7 @@ static ssize_t fuse_direct_read(struct file *file, char __user *buf,
static
ssize_t
__fuse_direct_write
(
struct
file
*
file
,
const
struct
iovec
*
iov
,
unsigned
long
nr_segs
,
loff_t
*
ppos
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
size_t
count
=
iov_length
(
iov
,
nr_segs
);
ssize_t
res
;
...
...
@@ -1258,7 +1258,7 @@ static ssize_t fuse_direct_write(struct file *file, const char __user *buf,
size_t
count
,
loff_t
*
ppos
)
{
struct
iovec
iov
=
{
.
iov_base
=
(
void
__user
*
)
buf
,
.
iov_len
=
count
};
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
ssize_t
res
;
if
(
is_bad_inode
(
inode
))
...
...
@@ -1485,7 +1485,7 @@ static const struct vm_operations_struct fuse_file_vm_ops = {
static
int
fuse_file_mmap
(
struct
file
*
file
,
struct
vm_area_struct
*
vma
)
{
if
((
vma
->
vm_flags
&
VM_SHARED
)
&&
(
vma
->
vm_flags
&
VM_MAYWRITE
))
{
struct
inode
*
inode
=
file
->
f_dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
struct
fuse_inode
*
fi
=
get_fuse_inode
(
inode
);
struct
fuse_file
*
ff
=
file
->
private_data
;
...
...
@@ -1543,7 +1543,7 @@ static void fuse_lk_fill(struct fuse_req *req, struct file *file,
const
struct
file_lock
*
fl
,
int
opcode
,
pid_t
pid
,
int
flock
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
struct
fuse_file
*
ff
=
file
->
private_data
;
struct
fuse_lk_in
*
arg
=
&
req
->
misc
.
lk_in
;
...
...
@@ -1565,7 +1565,7 @@ static void fuse_lk_fill(struct fuse_req *req, struct file *file,
static
int
fuse_getlk
(
struct
file
*
file
,
struct
file_lock
*
fl
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
struct
fuse_req
*
req
;
struct
fuse_lk_out
outarg
;
...
...
@@ -1590,7 +1590,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl)
static
int
fuse_setlk
(
struct
file
*
file
,
struct
file_lock
*
fl
,
int
flock
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
struct
fuse_req
*
req
;
int
opcode
=
(
fl
->
fl_flags
&
FL_SLEEP
)
?
FUSE_SETLKW
:
FUSE_SETLK
;
...
...
@@ -1622,7 +1622,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)
static
int
fuse_file_lock
(
struct
file
*
file
,
int
cmd
,
struct
file_lock
*
fl
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
int
err
;
...
...
@@ -1645,7 +1645,7 @@ static int fuse_file_lock(struct file *file, int cmd, struct file_lock *fl)
static
int
fuse_file_flock
(
struct
file
*
file
,
int
cmd
,
struct
file_lock
*
fl
)
{
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
int
err
;
...
...
@@ -1702,7 +1702,7 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block)
static
loff_t
fuse_file_llseek
(
struct
file
*
file
,
loff_t
offset
,
int
whence
)
{
loff_t
retval
;
struct
inode
*
inode
=
file
->
f_path
.
dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
/* No i_mutex protection necessary for SEEK_CUR and SEEK_SET */
if
(
whence
==
SEEK_CUR
||
whence
==
SEEK_SET
)
...
...
@@ -2079,7 +2079,7 @@ EXPORT_SYMBOL_GPL(fuse_do_ioctl);
long
fuse_ioctl_common
(
struct
file
*
file
,
unsigned
int
cmd
,
unsigned
long
arg
,
unsigned
int
flags
)
{
struct
inode
*
inode
=
file
->
f_dentry
->
d_inode
;
struct
inode
*
inode
=
file
_inode
(
file
)
;
struct
fuse_conn
*
fc
=
get_fuse_conn
(
inode
);
if
(
!
fuse_allow_current_process
(
fc
))
...
...
fs/seq_file.c
浏览文件 @
6131ffaa
...
...
@@ -339,7 +339,7 @@ EXPORT_SYMBOL(seq_lseek);
/**
* seq_release - free the structures associated with sequential file.
* @file: file in question
* @inode:
file->f_path.dentry->d_
inode
* @inode:
its
inode
*
* Frees the structures associated with sequential file; can be used
* as ->f_op->release() if you don't have private data to destroy.
...
...
kernel/futex.c
浏览文件 @
6131ffaa
...
...
@@ -226,7 +226,7 @@ static void drop_futex_key_refs(union futex_key *key)
* Returns a negative error code or 0
* The key words are stored in *key on success.
*
* For shared mappings, it's (page->index,
vma->vm_file->f_path.dentry->d_inode
,
* For shared mappings, it's (page->index,
file_inode(vma->vm_file)
,
* offset_within_page). For private mappings, it's (uaddr, current->mm).
* We can usually work out the index without swapping in the page.
*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录