[PATCH 2/6] f2fs: convert inline_data for punch_hole

From: Jaegeuk Kim
Date: Thu Dec 26 2013 - 23:02:34 EST


In the punch_hole(), let's convert inline_data all the time for simplicity and
to avoid potential deadlock conditions.
It is pretty much not a big deal to do this.

Signed-off-by: Jaegeuk Kim <jaegeuk.kim@xxxxxxxxxxx>
---
fs/f2fs/file.c | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 7ef2d6a..f64a1c8 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -462,25 +462,9 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)
loff_t off_start, off_end;
int ret = 0;

- if (f2fs_has_inline_data(inode)) {
- struct page *page;
- unsigned flags = AOP_FLAG_NOFS;
- page = grab_cache_page_write_begin(inode->i_mapping, 0, flags);
- if (IS_ERR(page))
- return PTR_ERR(page);
- if (offset + len > MAX_INLINE_DATA) {
- ret = f2fs_convert_inline_data(inode, page, flags);
- f2fs_put_page(page, 1);
- if (ret)
- return ret;
- } else {
- zero_user_segment(page, offset, offset + len);
- SetPageUptodate(page);
- set_page_dirty(page);
- f2fs_put_page(page, 1);
- return ret;
- }
- }
+ ret = f2fs_convert_inline_data(inode, NULL, AOP_FLAG_NOFS);
+ if (ret)
+ return ret;

pg_start = ((unsigned long long) offset) >> PAGE_CACHE_SHIFT;
pg_end = ((unsigned long long) offset + len) >> PAGE_CACHE_SHIFT;
--
1.8.4.474.g128a96c

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/