f2fs: flush dirty data for bmap
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: flush dirty data for bmap
Users expect bmap will give allocated block addresses. Let's play likewise ext4.
--- fs/f2fs/data.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
fs/f2fs/data.c +7 -6
@@ -1667,12 +1667,13 @@ static sector_t f2fs_bmap(struct address_space *mapping, sector_t block) {struct inode *inode = mapping->host; -/* we don't need to use inline_data strictly */ -if (f2fs_has_inline_data (inode)) { -int err =f2fs_convert_inline_inode (inode); -if (err) -return err; - } +if (f2fs_has_inline_data (inode)) +return 0 ; + +/* make sure allocating whole blocks */ +if (mapping_tagged (mapping,PAGECACHE_TAG_DIRTY )) +filemap_write_and_wait (mapping); +return generic_block_bmap (mapping, block, get_data_block_bmap); }
Signature · 4 lines
2.1.1 ------------------------------------------------------------------------------
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: support fiemap for inline_data
There is a FIEMAP_EXTENT_INLINE_DATA, pointed out by Marc.
--- fs/f2fs/data.c | 6 ++++++ fs/f2fs/f2fs.h | 2 ++ fs/f2fs/inline.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+)
fs/f2fs/data.c +6 -0
@@ -771,6 +771,12 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,if (ret)return ret; +if (f2fs_has_inline_data (inode)) { + ret =f2fs_inline_data_fiemap (inode, fieinfo, start, len); +if (ret != -EAGAIN ) +return ret; + } +mutex_lock (&inode->i_mutex);if (len >= isize) {
fs/f2fs/f2fs.h +2 -0
@@ -2054,6 +2054,8 @@ void f2fs_delete_inline_entry(struct f2fs_dir_entry *, struct page *,bool f2fs_empty_inline_dir (struct inode *);int f2fs_read_inline_dir (struct file *,struct dir_context *,struct f2fs_str *); +int f2fs_inline_data_fiemap (struct inode *, +struct fiemap_extent_info *,__u64 ,__u64 );/* * shrinker.c
fs/f2fs/inline.c +36 -0
@@ -12,6 +12,7 @@#include <linux/f2fs_fs.h> #include "f2fs.h" +#include "node.h" bool f2fs_may_inline_data (struct inode *inode) {
@@ -570,3 +571,38 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx,f2fs_put_page (ipage,1 );return 0 ; } + +int f2fs_inline_data_fiemap (struct inode *inode, +struct fiemap_extent_info *fieinfo,__u64 start,__u64 len) +{ +__u64 byteaddr, ilen; +__u32 flags =FIEMAP_EXTENT_DATA_INLINE |FIEMAP_EXTENT_NOT_ALIGNED | +FIEMAP_EXTENT_LAST ; +struct node_info ni; +struct page *ipage; +int err =0 ; + + ipage =get_node_page (F2FS_I_SB (inode), inode->i_ino); +if (IS_ERR (ipage)) +return PTR_ERR (ipage); + +if (!f2fs_has_inline_data (inode)) { + err = -EAGAIN ; + goto out; + } + + ilen =min_t (size_t,MAX_INLINE_DATA ,i_size_read (inode)); +if (start >= ilen) + goto out; +if (start + len < ilen) + ilen = start + len; + ilen -= start; + +get_node_info (F2FS_I_SB (inode), inode->i_ino, &ni); + byteaddr = (__u64 )ni.blk_addr << inode->i_sb->s_blocksize_bits; + byteaddr += (char *)inline_data_addr (ipage) - (char *)F2FS_INODE (ipage); + err =fiemap_fill_next_extent (fieinfo, start, byteaddr, ilen, flags); +out: +f2fs_put_page (ipage,1 ); +return err; +}
Signature · 4 lines
2.1.1 ------------------------------------------------------------------------------
RE: [f2fs-dev] [PATCH 2/2] f2fs: support fiemap for inline_data
Quoted 9 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Tuesday, October 20, 2015 2:49 AM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim; Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 2/2] f2fs: support fiemap forinline_data
Quoted 3 lines
There is a
FIEMAP_EXTENT_INLINE_DATA, pointed out by Marc.Signed-off-by Jaegeuk Kim <[email protected]>
Quoted 9 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Tuesday, October 20, 2015 2:49 AM
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Jaegeuk Kim; Jaegeuk Kim
Subject: [f2fs-dev] [PATCH 1/2] f2fs: flush dirty data for bmap
Quoted 4 lines
Users expect bmap will give allocated block addresses. Let's play likewise ext4.
Signed-off-by Jaegeuk Kim <[email protected]>