f2fs: support fiemap for inline_data

There is a FIEMAP_EXTENT_INLINE_DATA, pointed out by Marc.

Reviewed-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b052e7c262ac947fd465275a414a97bda9056224..972eab7ac07193da485df3efc6b6c11c99dacd97 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -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) {

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index c3443da2f991707c5d0dc6a54f8c13b4497291f2..9db5500d63d9805437a028fcedd0820a1ebf5135 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -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

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 3b18e23319c32c2f670e0b35f435f05d9c00507b..bda7126466c09f9b16f4d275cac5b287a06c9142 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -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;
+}