diff options
author | Tejun Heo <tj@kernel.org> | 2014-11-22 09:32:08 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-11-22 09:32:08 -0500 |
commit | cceb9bd63373061ad7b75c321808a2fb11c86545 (patch) | |
tree | a70d939eabed2e19538707402441644dfc26990e /fs/ext4/extents.c | |
parent | 56e4dea81a55c338eede625f715c7fa21f1a28c4 (diff) | |
parent | 8a84e01e147f44111988f9d8ccd2eaa30215a0f2 (diff) | |
download | linux-stable-cceb9bd63373061ad7b75c321808a2fb11c86545.tar.gz linux-stable-cceb9bd63373061ad7b75c321808a2fb11c86545.tar.bz2 linux-stable-cceb9bd63373061ad7b75c321808a2fb11c86545.zip |
Merge branch 'master' into for-3.19
Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to
rcu_dereference() for non-RCU situations").
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'fs/ext4/extents.c')
-rw-r--r-- | fs/ext4/extents.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 37043d0b2be8..0b16fb4c06d3 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3603,11 +3603,10 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, } } - allocated = ext4_split_extent(handle, inode, ppath, - &split_map, split_flag, flags); - if (allocated < 0) - err = allocated; - + err = ext4_split_extent(handle, inode, ppath, &split_map, split_flag, + flags); + if (err > 0) + err = 0; out: /* If we have gotten a failure, don't zero out status tree */ if (!err) |