Skip to content

Commit

Permalink
f2fs: continue to do direct IO if we only preallocate partial blocks
Browse files Browse the repository at this point in the history
While doing direct IO, if we run out-of-space when we preallocate blocks,
we should not return ENOSPC error directly, instead, we should continue
to do following direct IO, which will keep directIO of f2fs acting like
other filesystems.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
  • Loading branch information
Chao Yu authored and Jaegeuk Kim committed Jan 4, 2018
1 parent 6279398 commit d6d478a
Showing 1 changed file with 18 additions and 12 deletions.
30 changes: 18 additions & 12 deletions fs/f2fs/data.c
Original file line number Diff line number Diff line change
@@ -832,10 +832,12 @@ int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from)
{
struct inode *inode = file_inode(iocb->ki_filp);
struct f2fs_map_blocks map;
int flag;
int err = 0;
bool direct_io = iocb->ki_flags & IOCB_DIRECT;

/* convert inline data for Direct I/O*/
if (iocb->ki_flags & IOCB_DIRECT) {
if (direct_io) {
err = f2fs_convert_inline_inode(inode);
if (err)
return err;
@@ -854,25 +856,29 @@ int f2fs_preallocate_blocks(struct kiocb *iocb, struct iov_iter *from)
map.m_next_pgofs = NULL;
map.m_seg_type = NO_CHECK_TYPE;

if (iocb->ki_flags & IOCB_DIRECT) {
if (direct_io) {
map.m_seg_type = rw_hint_to_seg_type(iocb->ki_hint);
return f2fs_map_blocks(inode, &map, 1,
__force_buffered_io(inode, WRITE) ?
F2FS_GET_BLOCK_PRE_AIO :
F2FS_GET_BLOCK_PRE_DIO);
flag = __force_buffered_io(inode, WRITE) ?
F2FS_GET_BLOCK_PRE_AIO :
F2FS_GET_BLOCK_PRE_DIO;
goto map_blocks;
}
if (iocb->ki_pos + iov_iter_count(from) > MAX_INLINE_DATA(inode)) {
err = f2fs_convert_inline_inode(inode);
if (err)
return err;
}
if (!f2fs_has_inline_data(inode)) {
err = f2fs_map_blocks(inode, &map, 1, F2FS_GET_BLOCK_PRE_AIO);
if (map.m_len > 0 && err == -ENOSPC) {
set_inode_flag(inode, FI_NO_PREALLOC);
err = 0;
}
if (f2fs_has_inline_data(inode))
return err;

flag = F2FS_GET_BLOCK_PRE_AIO;

map_blocks:
err = f2fs_map_blocks(inode, &map, 1, flag);
if (map.m_len > 0 && err == -ENOSPC) {
if (!direct_io)
set_inode_flag(inode, FI_NO_PREALLOC);
err = 0;
}
return err;
}

0 comments on commit d6d478a

Please sign in to comment.