Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
84363182
Commit
84363182
authored
Apr 04, 2015
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
->aio_read and ->aio_write removed
no remaining users Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
1c65d986
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
54 deletions
+9
-54
Documentation/filesystems/Locking
Documentation/filesystems/Locking
+0
-2
Documentation/filesystems/porting
Documentation/filesystems/porting
+3
-0
Documentation/filesystems/vfs.txt
Documentation/filesystems/vfs.txt
+0
-6
fs/aio.c
fs/aio.c
+2
-11
fs/file_table.c
fs/file_table.c
+2
-2
fs/open.c
fs/open.c
+2
-2
fs/read_write.c
fs/read_write.c
+0
-29
include/linux/fs.h
include/linux/fs.h
+0
-2
No files found.
Documentation/filesystems/Locking
View file @
84363182
...
...
@@ -429,8 +429,6 @@ prototypes:
loff_t (*llseek) (struct file *, loff_t, int);
ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
int (*iterate) (struct file *, struct dir_context *);
...
...
Documentation/filesystems/porting
View file @
84363182
...
...
@@ -480,3 +480,6 @@ in your dentry operations instead.
[mandatory]
do _not_ use new_sync_{read,write} for ->read/->write; leave it NULL
instead.
--
[mandatory]
->aio_read/->aio_write are gone. Use ->read_iter/->write_iter.
Documentation/filesystems/vfs.txt
View file @
84363182
...
...
@@ -804,8 +804,6 @@ struct file_operations {
loff_t (*llseek) (struct file *, loff_t, int);
ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
ssize_t (*aio_read) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
int (*iterate) (struct file *, struct dir_context *);
...
...
@@ -838,14 +836,10 @@ otherwise noted.
read: called by read(2) and related system calls
aio_read: vectored, possibly asynchronous read
read_iter: possibly asynchronous read with iov_iter as destination
write: called by write(2) and related system calls
aio_write: vectored, possibly asynchronous write
write_iter: possibly asynchronous write with iov_iter as source
iterate: called when the VFS needs to read the directory contents
...
...
fs/aio.c
View file @
84363182
...
...
@@ -1347,8 +1347,6 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
return
-
EINVAL
;
}
typedef
ssize_t
(
aio_rw_op
)(
struct
kiocb
*
,
const
struct
iovec
*
,
unsigned
long
,
loff_t
);
typedef
ssize_t
(
rw_iter_op
)(
struct
kiocb
*
,
struct
iov_iter
*
);
static
int
aio_setup_vectored_rw
(
int
rw
,
char
__user
*
buf
,
size_t
len
,
...
...
@@ -1377,7 +1375,6 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
ssize_t
ret
;
int
rw
;
fmode_t
mode
;
aio_rw_op
*
rw_op
;
rw_iter_op
*
iter_op
;
struct
iovec
inline_vecs
[
UIO_FASTIOV
],
*
iovec
=
inline_vecs
;
struct
iov_iter
iter
;
...
...
@@ -1387,7 +1384,6 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
case
IOCB_CMD_PREADV
:
mode
=
FMODE_READ
;
rw
=
READ
;
rw_op
=
file
->
f_op
->
aio_read
;
iter_op
=
file
->
f_op
->
read_iter
;
goto
rw_common
;
...
...
@@ -1395,14 +1391,13 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
case
IOCB_CMD_PWRITEV
:
mode
=
FMODE_WRITE
;
rw
=
WRITE
;
rw_op
=
file
->
f_op
->
aio_write
;
iter_op
=
file
->
f_op
->
write_iter
;
goto
rw_common
;
rw_common:
if
(
unlikely
(
!
(
file
->
f_mode
&
mode
)))
return
-
EBADF
;
if
(
!
rw_op
&&
!
iter_op
)
if
(
!
iter_op
)
return
-
EINVAL
;
if
(
opcode
==
IOCB_CMD_PREADV
||
opcode
==
IOCB_CMD_PWRITEV
)
...
...
@@ -1425,11 +1420,7 @@ static ssize_t aio_run_iocb(struct kiocb *req, unsigned opcode,
if
(
rw
==
WRITE
)
file_start_write
(
file
);
if
(
iter_op
)
{
ret
=
iter_op
(
req
,
&
iter
);
}
else
{
ret
=
rw_op
(
req
,
iter
.
iov
,
iter
.
nr_segs
,
req
->
ki_pos
);
}
ret
=
iter_op
(
req
,
&
iter
);
if
(
rw
==
WRITE
)
file_end_write
(
file
);
...
...
fs/file_table.c
View file @
84363182
...
...
@@ -168,10 +168,10 @@ struct file *alloc_file(struct path *path, fmode_t mode,
file
->
f_inode
=
path
->
dentry
->
d_inode
;
file
->
f_mapping
=
path
->
dentry
->
d_inode
->
i_mapping
;
if
((
mode
&
FMODE_READ
)
&&
likely
(
fop
->
read
||
fop
->
aio_read
||
fop
->
read_iter
))
likely
(
fop
->
read
||
fop
->
read_iter
))
mode
|=
FMODE_CAN_READ
;
if
((
mode
&
FMODE_WRITE
)
&&
likely
(
fop
->
write
||
fop
->
aio_write
||
fop
->
write_iter
))
likely
(
fop
->
write
||
fop
->
write_iter
))
mode
|=
FMODE_CAN_WRITE
;
file
->
f_mode
=
mode
;
file
->
f_op
=
fop
;
...
...
fs/open.c
View file @
84363182
...
...
@@ -734,10 +734,10 @@ static int do_dentry_open(struct file *f,
if
((
f
->
f_mode
&
(
FMODE_READ
|
FMODE_WRITE
))
==
FMODE_READ
)
i_readcount_inc
(
inode
);
if
((
f
->
f_mode
&
FMODE_READ
)
&&
likely
(
f
->
f_op
->
read
||
f
->
f_op
->
aio_read
||
f
->
f_op
->
read_iter
))
likely
(
f
->
f_op
->
read
||
f
->
f_op
->
read_iter
))
f
->
f_mode
|=
FMODE_CAN_READ
;
if
((
f
->
f_mode
&
FMODE_WRITE
)
&&
likely
(
f
->
f_op
->
write
||
f
->
f_op
->
aio_write
||
f
->
f_op
->
write_iter
))
likely
(
f
->
f_op
->
write
||
f
->
f_op
->
write_iter
))
f
->
f_mode
|=
FMODE_CAN_WRITE
;
f
->
f_flags
&=
~
(
O_CREAT
|
O_EXCL
|
O_NOCTTY
|
O_TRUNC
);
...
...
fs/read_write.c
View file @
84363182
...
...
@@ -22,8 +22,6 @@
#include <asm/unistd.h>
typedef
ssize_t
(
*
io_fn_t
)(
struct
file
*
,
char
__user
*
,
size_t
,
loff_t
*
);
typedef
ssize_t
(
*
iov_fn_t
)(
struct
kiocb
*
,
const
struct
iovec
*
,
unsigned
long
,
loff_t
);
typedef
ssize_t
(
*
iter_fn_t
)(
struct
kiocb
*
,
struct
iov_iter
*
);
const
struct
file_operations
generic_ro_fops
=
{
...
...
@@ -668,21 +666,6 @@ static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter,
return
ret
;
}
static
ssize_t
do_sync_readv_writev
(
struct
file
*
filp
,
struct
iov_iter
*
iter
,
loff_t
*
ppos
,
iov_fn_t
fn
)
{
struct
kiocb
kiocb
;
ssize_t
ret
;
init_sync_kiocb
(
&
kiocb
,
filp
);
kiocb
.
ki_pos
=
*
ppos
;
ret
=
fn
(
&
kiocb
,
iter
->
iov
,
iter
->
nr_segs
,
kiocb
.
ki_pos
);
BUG_ON
(
ret
==
-
EIOCBQUEUED
);
*
ppos
=
kiocb
.
ki_pos
;
return
ret
;
}
/* Do it by hand, with file-ops */
static
ssize_t
do_loop_readv_writev
(
struct
file
*
filp
,
struct
iov_iter
*
iter
,
loff_t
*
ppos
,
io_fn_t
fn
)
...
...
@@ -797,7 +780,6 @@ static ssize_t do_readv_writev(int type, struct file *file,
struct
iov_iter
iter
;
ssize_t
ret
;
io_fn_t
fn
;
iov_fn_t
fnv
;
iter_fn_t
iter_fn
;
ret
=
import_iovec
(
type
,
uvector
,
nr_segs
,
...
...
@@ -812,22 +794,17 @@ static ssize_t do_readv_writev(int type, struct file *file,
if
(
ret
<
0
)
goto
out
;
fnv
=
NULL
;
if
(
type
==
READ
)
{
fn
=
file
->
f_op
->
read
;
fnv
=
file
->
f_op
->
aio_read
;
iter_fn
=
file
->
f_op
->
read_iter
;
}
else
{
fn
=
(
io_fn_t
)
file
->
f_op
->
write
;
fnv
=
file
->
f_op
->
aio_write
;
iter_fn
=
file
->
f_op
->
write_iter
;
file_start_write
(
file
);
}
if
(
iter_fn
)
ret
=
do_iter_readv_writev
(
file
,
&
iter
,
pos
,
iter_fn
);
else
if
(
fnv
)
ret
=
do_sync_readv_writev
(
file
,
&
iter
,
pos
,
fnv
);
else
ret
=
do_loop_readv_writev
(
file
,
&
iter
,
pos
,
fn
);
...
...
@@ -977,7 +954,6 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
struct
iov_iter
iter
;
ssize_t
ret
;
io_fn_t
fn
;
iov_fn_t
fnv
;
iter_fn_t
iter_fn
;
ret
=
compat_import_iovec
(
type
,
uvector
,
nr_segs
,
...
...
@@ -992,22 +968,17 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
if
(
ret
<
0
)
goto
out
;
fnv
=
NULL
;
if
(
type
==
READ
)
{
fn
=
file
->
f_op
->
read
;
fnv
=
file
->
f_op
->
aio_read
;
iter_fn
=
file
->
f_op
->
read_iter
;
}
else
{
fn
=
(
io_fn_t
)
file
->
f_op
->
write
;
fnv
=
file
->
f_op
->
aio_write
;
iter_fn
=
file
->
f_op
->
write_iter
;
file_start_write
(
file
);
}
if
(
iter_fn
)
ret
=
do_iter_readv_writev
(
file
,
&
iter
,
pos
,
iter_fn
);
else
if
(
fnv
)
ret
=
do_sync_readv_writev
(
file
,
&
iter
,
pos
,
fnv
);
else
ret
=
do_loop_readv_writev
(
file
,
&
iter
,
pos
,
fn
);
...
...
include/linux/fs.h
View file @
84363182
...
...
@@ -1562,8 +1562,6 @@ struct file_operations {
loff_t
(
*
llseek
)
(
struct
file
*
,
loff_t
,
int
);
ssize_t
(
*
read
)
(
struct
file
*
,
char
__user
*
,
size_t
,
loff_t
*
);
ssize_t
(
*
write
)
(
struct
file
*
,
const
char
__user
*
,
size_t
,
loff_t
*
);
ssize_t
(
*
aio_read
)
(
struct
kiocb
*
,
const
struct
iovec
*
,
unsigned
long
,
loff_t
);
ssize_t
(
*
aio_write
)
(
struct
kiocb
*
,
const
struct
iovec
*
,
unsigned
long
,
loff_t
);
ssize_t
(
*
read_iter
)
(
struct
kiocb
*
,
struct
iov_iter
*
);
ssize_t
(
*
write_iter
)
(
struct
kiocb
*
,
struct
iov_iter
*
);
int
(
*
iterate
)
(
struct
file
*
,
struct
dir_context
*
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment