diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-02-11 19:56:46 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-03-12 23:50:23 -0400 |
| commit | 66ee59af630fd8d5f4f56fb28162857e629aa0ab (patch) | |
| tree | d1c4293f986fcb20824c90a2ab5f3f4e62543f8a /fs/ocfs2 | |
| parent | 96b62a57193494010eed66ca0739c93eb4653162 (diff) | |
| download | op-kernel-dev-66ee59af630fd8d5f4f56fb28162857e629aa0ab.zip op-kernel-dev-66ee59af630fd8d5f4f56fb28162857e629aa0ab.tar.gz | |
fs: remove ki_nbytes
There is no need to pass the total request length in the kiocb, as
we already get passed in through the iov_iter argument.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/file.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 46e0d4e..266845d 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2280,7 +2280,7 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb, file->f_path.dentry->d_name.name, (unsigned int)from->nr_segs); /* GRRRRR */ - if (iocb->ki_nbytes == 0) + if (count == 0) return 0; appending = file->f_flags & O_APPEND ? 1 : 0; @@ -2330,8 +2330,7 @@ relock: } can_do_direct = direct_io; - ret = ocfs2_prepare_inode_for_write(file, ppos, - iocb->ki_nbytes, appending, + ret = ocfs2_prepare_inode_for_write(file, ppos, count, appending, &can_do_direct, &has_refcount); if (ret < 0) { mlog_errno(ret); @@ -2339,8 +2338,7 @@ relock: } if (direct_io && !is_sync_kiocb(iocb)) - unaligned_dio = ocfs2_is_io_unaligned(inode, iocb->ki_nbytes, - *ppos); + unaligned_dio = ocfs2_is_io_unaligned(inode, count, *ppos); /* * We can't complete the direct I/O as requested, fall back to |
