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
Kirill Smelkov
linux
Commits
d4637bc1
Commit
d4637bc1
authored
Apr 03, 2014
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
udf: switch to ->write_iter()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
9b884164
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
fs/udf/file.c
fs/udf/file.c
+5
-6
No files found.
fs/udf/file.c
View file @
d4637bc1
...
@@ -134,8 +134,7 @@ const struct address_space_operations udf_adinicb_aops = {
...
@@ -134,8 +134,7 @@ const struct address_space_operations udf_adinicb_aops = {
.
direct_IO
=
udf_adinicb_direct_IO
,
.
direct_IO
=
udf_adinicb_direct_IO
,
};
};
static
ssize_t
udf_file_aio_write
(
struct
kiocb
*
iocb
,
const
struct
iovec
*
iov
,
static
ssize_t
udf_file_write_iter
(
struct
kiocb
*
iocb
,
struct
iov_iter
*
from
)
unsigned
long
nr_segs
,
loff_t
ppos
)
{
{
ssize_t
retval
;
ssize_t
retval
;
struct
file
*
file
=
iocb
->
ki_filp
;
struct
file
*
file
=
iocb
->
ki_filp
;
...
@@ -150,7 +149,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
...
@@ -150,7 +149,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
if
(
file
->
f_flags
&
O_APPEND
)
if
(
file
->
f_flags
&
O_APPEND
)
pos
=
inode
->
i_size
;
pos
=
inode
->
i_size
;
else
else
pos
=
p
pos
;
pos
=
iocb
->
ki_
pos
;
if
(
inode
->
i_sb
->
s_blocksize
<
if
(
inode
->
i_sb
->
s_blocksize
<
(
udf_file_entry_alloc_offset
(
inode
)
+
(
udf_file_entry_alloc_offset
(
inode
)
+
...
@@ -171,7 +170,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
...
@@ -171,7 +170,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
}
else
}
else
up_write
(
&
iinfo
->
i_data_sem
);
up_write
(
&
iinfo
->
i_data_sem
);
retval
=
__generic_file_
aio_write
(
iocb
,
iov
,
nr_segs
);
retval
=
__generic_file_
write_iter
(
iocb
,
from
);
mutex_unlock
(
&
inode
->
i_mutex
);
mutex_unlock
(
&
inode
->
i_mutex
);
if
(
retval
>
0
)
{
if
(
retval
>
0
)
{
...
@@ -257,8 +256,8 @@ const struct file_operations udf_file_operations = {
...
@@ -257,8 +256,8 @@ const struct file_operations udf_file_operations = {
.
unlocked_ioctl
=
udf_ioctl
,
.
unlocked_ioctl
=
udf_ioctl
,
.
open
=
generic_file_open
,
.
open
=
generic_file_open
,
.
mmap
=
generic_file_mmap
,
.
mmap
=
generic_file_mmap
,
.
write
=
do
_sync_write
,
.
write
=
new
_sync_write
,
.
aio_write
=
udf_file_aio_write
,
.
write_iter
=
udf_file_write_iter
,
.
release
=
udf_release_file
,
.
release
=
udf_release_file
,
.
fsync
=
generic_file_fsync
,
.
fsync
=
generic_file_fsync
,
.
splice_read
=
generic_file_splice_read
,
.
splice_read
=
generic_file_splice_read
,
...
...
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