diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-06-21 01:37:24 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-06-23 18:01:07 -0400 |
commit | 6b6dabc8dcefaf9997ce037c70b32d570ced9d3e (patch) | |
tree | 24372b08d5f9f1b4b8da05eb3383786806419cc1 /fs | |
parent | 2726d56620ce71f40dd583d51391b86e1ab8cc57 (diff) |
nilfs2_direct_IO(): remove dead code
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nilfs2/inode.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 258d9fe2521a..4a73d6dffabf 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c | |||
@@ -307,31 +307,13 @@ static int nilfs_write_end(struct file *file, struct address_space *mapping, | |||
307 | static ssize_t | 307 | static ssize_t |
308 | nilfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset) | 308 | nilfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset) |
309 | { | 309 | { |
310 | struct file *file = iocb->ki_filp; | 310 | struct inode *inode = file_inode(iocb->ki_filp); |
311 | struct address_space *mapping = file->f_mapping; | ||
312 | struct inode *inode = file->f_mapping->host; | ||
313 | size_t count = iov_iter_count(iter); | ||
314 | ssize_t size; | ||
315 | 311 | ||
316 | if (iov_iter_rw(iter) == WRITE) | 312 | if (iov_iter_rw(iter) == WRITE) |
317 | return 0; | 313 | return 0; |
318 | 314 | ||
319 | /* Needs synchronization with the cleaner */ | 315 | /* Needs synchronization with the cleaner */ |
320 | size = blockdev_direct_IO(iocb, inode, iter, offset, nilfs_get_block); | 316 | return blockdev_direct_IO(iocb, inode, iter, offset, nilfs_get_block); |
321 | |||
322 | /* | ||
323 | * In case of error extending write may have instantiated a few | ||
324 | * blocks outside i_size. Trim these off again. | ||
325 | */ | ||
326 | if (unlikely(iov_iter_rw(iter) == WRITE && size < 0)) { | ||
327 | loff_t isize = i_size_read(inode); | ||
328 | loff_t end = offset + count; | ||
329 | |||
330 | if (end > isize) | ||
331 | nilfs_write_failed(mapping, end); | ||
332 | } | ||
333 | |||
334 | return size; | ||
335 | } | 317 | } |
336 | 318 | ||
337 | const struct address_space_operations nilfs_aops = { | 319 | const struct address_space_operations nilfs_aops = { |