diff options
| author | Chao Yu <yuchao0@huawei.com> | 2019-07-22 18:03:50 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2019-08-23 07:57:11 -0700 |
| commit | 7975f3498dc0403d8177c0775b9514158ec66681 (patch) | |
| tree | a2852ce6094778eff567b1ebeeab95315003c0f3 | |
| parent | 04f9287ab395a5a279db44fb39de69b23640abb9 (diff) | |
f2fs: support fiemap() for directory inode
Adjust f2fs_fiemap() to support fiemap() on directory inode.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
| -rw-r--r-- | fs/f2fs/data.c | 2 | ||||
| -rw-r--r-- | fs/f2fs/inline.c | 8 | ||||
| -rw-r--r-- | fs/f2fs/namei.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 5bce20005add..73ed4ff9d01c 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1539,7 +1539,7 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, goto out; } - if (f2fs_has_inline_data(inode)) { + if (f2fs_has_inline_data(inode) || f2fs_has_inline_dentry(inode)) { ret = f2fs_inline_data_fiemap(inode, fieinfo, start, len); if (ret != -EAGAIN) goto out; diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 3613efca8c00..8c0712154fb1 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -704,7 +704,13 @@ int f2fs_inline_data_fiemap(struct inode *inode, if (IS_ERR(ipage)) return PTR_ERR(ipage); - if (!f2fs_has_inline_data(inode)) { + if ((S_ISREG(inode->i_mode) || S_ISLNK(inode->i_mode)) && + !f2fs_has_inline_data(inode)) { + err = -EAGAIN; + goto out; + } + + if (S_ISDIR(inode->i_mode) && !f2fs_has_inline_dentry(inode)) { err = -EAGAIN; goto out; } diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index c5b99042e6f2..612561c4f7bd 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -1250,6 +1250,7 @@ const struct inode_operations f2fs_dir_inode_operations = { #ifdef CONFIG_F2FS_FS_XATTR .listxattr = f2fs_listxattr, #endif + .fiemap = f2fs_fiemap, }; const struct inode_operations f2fs_symlink_inode_operations = { |