evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

udf: switch to ->write_iter()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-04-03 03:31:17 -04:00
parent 9b884164d5
commit d4637bc18f
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fs/udf/file.c
View file

@ -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,
if (file->f_flags & O_APPEND) if (file->f_flags & O_APPEND)
pos = inode->i_size; pos = inode->i_size;
else else
pos = ppos; 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,
} 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 = {
.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,