aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/extents.c
diff options
context:
space:
mode:
authorDmitry Monakhov <dmonakhov@openvz.org>2014-12-02 16:11:20 -0500
committerTheodore Ts'o <tytso@mit.edu>2014-12-02 16:11:20 -0500
commitd952d69e268f833c85c0bafee9f67f9dba85044b (patch)
tree8292c9e39fa90e279a9e1698f894d400579b6c5b /fs/ext4/extents.c
parentext4: prevent fsreentrance deadlock for inline_data (diff)
downloadlinux-dev-d952d69e268f833c85c0bafee9f67f9dba85044b.tar.xz
linux-dev-d952d69e268f833c85c0bafee9f67f9dba85044b.zip
ext4: ext4_inline_data_fiemap should respect callers argument
Currently ext4_inline_data_fiemap ignores requested arguments (start and len) which may lead endless loop if start != 0. Also fix incorrect extent length determination. Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/extents.c')
-rw-r--r--fs/ext4/extents.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index c3a1fa1398f5..bed43081720f 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -5151,7 +5151,8 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
if (ext4_has_inline_data(inode)) {
int has_inline = 1;
- error = ext4_inline_data_fiemap(inode, fieinfo, &has_inline);
+ error = ext4_inline_data_fiemap(inode, fieinfo, &has_inline,
+ start, len);
if (has_inline)
return error;