diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-03 22:03:20 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:42 -0400 |
commit | f8579f8673b7ecdb7a81d5d5bb1d981093d9aa94 (patch) | |
tree | d4287d0dffbf3758e709238302fb8865cdd66651 /fs/btrfs | |
parent | e7c24607b5d68a4cdc56e09d70a3c8bae5f0519f (diff) |
generic_file_direct_write(): switch to iov_iter
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/file.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index ae6af072b635..9fe20c2052af 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c | |||
@@ -1669,15 +1669,13 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb, | |||
1669 | loff_t endbyte; | 1669 | loff_t endbyte; |
1670 | int err; | 1670 | int err; |
1671 | 1671 | ||
1672 | written = generic_file_direct_write(iocb, iov, &nr_segs, pos, | 1672 | iov_iter_init(&i, iov, nr_segs, count, 0); |
1673 | count, ocount); | 1673 | written = generic_file_direct_write(iocb, &i, pos, count, ocount); |
1674 | 1674 | ||
1675 | if (written < 0 || written == count) | 1675 | if (written < 0 || written == count) |
1676 | return written; | 1676 | return written; |
1677 | 1677 | ||
1678 | pos += written; | 1678 | pos += written; |
1679 | count -= written; | ||
1680 | iov_iter_init(&i, iov, nr_segs, count, written); | ||
1681 | written_buffered = __btrfs_buffered_write(file, &i, pos); | 1679 | written_buffered = __btrfs_buffered_write(file, &i, pos); |
1682 | if (written_buffered < 0) { | 1680 | if (written_buffered < 0) { |
1683 | err = written_buffered; | 1681 | err = written_buffered; |