diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:03:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:03:41 +0800 |
| commit | 9cebd248bd83dea5ead3f1ab5f3cbaf241588e37 (patch) | |
| tree | 5f2d8fd7122c345045c476d57cb7c5ad17a4f08b /fs/orangefs/file.c | |
| parent | 4f0ca2b2718d297c88b1c303f2d414327c537636 (diff) | |
| parent | 6c6f924f9c6294944ee6efb1bbd8cdb853582e50 (diff) | |
Merge tag 'v4.9.79' into linux-linaro-lsk-v4.9lsk-v4.9-18.02
This is the 4.9.79 stable release
Diffstat (limited to 'fs/orangefs/file.c')
| -rw-r--r-- | fs/orangefs/file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index 02cc6139ec90..5b2cbe567365 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -446,7 +446,7 @@ ssize_t orangefs_inode_read(struct inode *inode, static ssize_t orangefs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) { struct file *file = iocb->ki_filp; - loff_t pos = *(&iocb->ki_pos); + loff_t pos = iocb->ki_pos; ssize_t rc = 0; BUG_ON(iocb->private); @@ -485,9 +485,6 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, struct iov_iter *ite } } - if (file->f_pos > i_size_read(file->f_mapping->host)) - orangefs_i_size_write(file->f_mapping->host, file->f_pos); - rc = generic_write_checks(iocb, iter); if (rc <= 0) { @@ -501,7 +498,7 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, struct iov_iter *ite * pos to the end of the file, so we will wait till now to set * pos... */ - pos = *(&iocb->ki_pos); + pos = iocb->ki_pos; rc = do_readv_writev(ORANGEFS_IO_WRITE, file, |