summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorDmitry Monakhov <dmonakhov@openvz.org>2014-04-13 15:05:42 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-04-13 15:05:42 -0400
commit8dc79ec4c0537e1b83c0739af82a7babefb30012 (patch)
treef05bb659846f3643941fe2ddd4faf96a5cb494bb /fs/ext4
parente2cbd587418251bb73c4c1e8e2c7c1816d7a98d9 (diff)
downloadlinux-8dc79ec4c0537e1b83c0739af82a7babefb30012.tar.gz
linux-8dc79ec4c0537e1b83c0739af82a7babefb30012.tar.bz2
linux-8dc79ec4c0537e1b83c0739af82a7babefb30012.zip
ext4: fix error handling in ext4_ext_shift_extents
Fix error handling by adding some. :-) Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/extents.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 96e0a4bc8faa..38be06354b88 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -5314,11 +5314,18 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
* enough to accomodate the shift.
*/
path = ext4_ext_find_extent(inode, start - 1, NULL, 0);
+ if (IS_ERR(path))
+ return PTR_ERR(path);
depth = path->p_depth;
extent = path[depth].p_ext;
- ex_start = le32_to_cpu(extent->ee_block);
- ex_end = le32_to_cpu(extent->ee_block) +
+ if (extent) {
+ ex_start = le32_to_cpu(extent->ee_block);
+ ex_end = le32_to_cpu(extent->ee_block) +
ext4_ext_get_actual_len(extent);
+ } else {
+ ex_start = 0;
+ ex_end = 0;
+ }
ext4_ext_drop_refs(path);
kfree(path);