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
02797829
Commit
02797829
authored
Apr 02, 2014
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ecryptfs: switch to ->read_iter()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
b4f5d2c6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
fs/ecryptfs/file.c
fs/ecryptfs/file.c
+4
-5
No files found.
fs/ecryptfs/file.c
View file @
02797829
...
@@ -45,14 +45,13 @@
...
@@ -45,14 +45,13 @@
* The function to be used for directory reads is ecryptfs_read.
* The function to be used for directory reads is ecryptfs_read.
*/
*/
static
ssize_t
ecryptfs_read_update_atime
(
struct
kiocb
*
iocb
,
static
ssize_t
ecryptfs_read_update_atime
(
struct
kiocb
*
iocb
,
const
struct
iovec
*
iov
,
struct
iov_iter
*
to
)
unsigned
long
nr_segs
,
loff_t
pos
)
{
{
ssize_t
rc
;
ssize_t
rc
;
struct
path
*
path
;
struct
path
*
path
;
struct
file
*
file
=
iocb
->
ki_filp
;
struct
file
*
file
=
iocb
->
ki_filp
;
rc
=
generic_file_
aio_read
(
iocb
,
iov
,
nr_segs
,
pos
);
rc
=
generic_file_
read_iter
(
iocb
,
to
);
/*
/*
* Even though this is a async interface, we need to wait
* Even though this is a async interface, we need to wait
* for IO to finish to update atime
* for IO to finish to update atime
...
@@ -352,8 +351,8 @@ const struct file_operations ecryptfs_dir_fops = {
...
@@ -352,8 +351,8 @@ const struct file_operations ecryptfs_dir_fops = {
const
struct
file_operations
ecryptfs_main_fops
=
{
const
struct
file_operations
ecryptfs_main_fops
=
{
.
llseek
=
generic_file_llseek
,
.
llseek
=
generic_file_llseek
,
.
read
=
do
_sync_read
,
.
read
=
new
_sync_read
,
.
aio_read
=
ecryptfs_read_update_atime
,
.
read_iter
=
ecryptfs_read_update_atime
,
.
write
=
do_sync_write
,
.
write
=
do_sync_write
,
.
aio_write
=
generic_file_aio_write
,
.
aio_write
=
generic_file_aio_write
,
.
iterate
=
ecryptfs_readdir
,
.
iterate
=
ecryptfs_readdir
,
...
...
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