projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
[cascardo/linux.git]
/
fs
/
udf
/
file.c
diff --git
a/fs/udf/file.c
b/fs/udf/file.c
index
d2c170f
..
d80738f
100644
(file)
--- a/
fs/udf/file.c
+++ b/
fs/udf/file.c
@@
-119,8
+119,8
@@
static int udf_adinicb_write_end(struct file *file,
}
static ssize_t udf_adinicb_direct_IO(int rw, struct kiocb *iocb,
}
static ssize_t udf_adinicb_direct_IO(int rw, struct kiocb *iocb,
-
const struct iovec *iov
,
- loff_t offset
, unsigned long nr_segs
)
+
struct iov_iter *iter
,
+ loff_t offset)
{
/* Fallback to buffered I/O. */
return 0;
{
/* Fallback to buffered I/O. */
return 0;
@@
-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,
- unsigned long nr_segs, loff_t ppos)
+static ssize_t udf_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
{
ssize_t retval;
struct file *file = iocb->ki_filp;
{
ssize_t retval;
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)
pos = inode->i_size;
else
if (file->f_flags & O_APPEND)
pos = inode->i_size;
else
- pos =
p
pos;
+ pos =
iocb->ki_
pos;
if (inode->i_sb->s_blocksize <
(udf_file_entry_alloc_offset(inode) +
if (inode->i_sb->s_blocksize <
(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
up_write(&iinfo->i_data_sem);
} else
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);
if (retval > 0) {
mutex_unlock(&inode->i_mutex);
if (retval > 0) {
@@
-252,13
+251,13
@@
static int udf_release_file(struct inode *inode, struct file *filp)
}
const struct file_operations udf_file_operations = {
}
const struct file_operations udf_file_operations = {
- .read =
do
_sync_read,
- .
aio_read = generic_file_aio_read
,
+ .read =
new
_sync_read,
+ .
read_iter = generic_file_read_iter
,
.unlocked_ioctl = udf_ioctl,
.open = generic_file_open,
.mmap = generic_file_mmap,
.unlocked_ioctl = udf_ioctl,
.open = generic_file_open,
.mmap = generic_file_mmap,
- .write =
do
_sync_write,
- .
aio_write = udf_file_aio_write
,
+ .write =
new
_sync_write,
+ .
write_iter = udf_file_write_iter
,
.release = udf_release_file,
.fsync = generic_file_fsync,
.splice_read = generic_file_splice_read,
.release = udf_release_file,
.fsync = generic_file_fsync,
.splice_read = generic_file_splice_read,