aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRoman Pen <roman.penyaev@profitbricks.com>2017-01-08 21:00:35 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-12 00:41:45 -0500
commite0b53d67291334125531f7f21b2f3df3d6ccc6ec (patch)
tree45797352f86c5abd56bc53f89b514571cc4432b6 /fs
parent72ae476d0401c38c912ad740cadcc7ef302f5ef2 (diff)
ext4: do not polute the extents cache while shifting extents
commit 03e916fa8b5577d85471452a3d0c5738aa658dae upstream. Inside ext4_ext_shift_extents() function ext4_find_extent() is called without EXT4_EX_NOCACHE flag, which should prevent cache population. This leads to oudated offsets in the extents tree and wrong blocks afterwards. Patch fixes the problem providing EXT4_EX_NOCACHE flag for each ext4_find_extents() call inside ext4_ext_shift_extents function. Fixes: 331573febb6a2 Signed-off-by: Roman Pen <roman.penyaev@profitbricks.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: Namjae Jeon <namjae.jeon@samsung.com> Cc: Andreas Dilger <adilger.kernel@dilger.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/extents.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index b4987ea2ca79..9fbf92ca358c 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -5344,7 +5344,8 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
5344 ext4_lblk_t stop, *iterator, ex_start, ex_end; 5344 ext4_lblk_t stop, *iterator, ex_start, ex_end;
5345 5345
5346 /* Let path point to the last extent */ 5346 /* Let path point to the last extent */
5347 path = ext4_find_extent(inode, EXT_MAX_BLOCKS - 1, NULL, 0); 5347 path = ext4_find_extent(inode, EXT_MAX_BLOCKS - 1, NULL,
5348 EXT4_EX_NOCACHE);
5348 if (IS_ERR(path)) 5349 if (IS_ERR(path))
5349 return PTR_ERR(path); 5350 return PTR_ERR(path);
5350 5351
@@ -5360,7 +5361,8 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
5360 * sure the hole is big enough to accommodate the shift. 5361 * sure the hole is big enough to accommodate the shift.
5361 */ 5362 */
5362 if (SHIFT == SHIFT_LEFT) { 5363 if (SHIFT == SHIFT_LEFT) {
5363 path = ext4_find_extent(inode, start - 1, &path, 0); 5364 path = ext4_find_extent(inode, start - 1, &path,
5365 EXT4_EX_NOCACHE);
5364 if (IS_ERR(path)) 5366 if (IS_ERR(path))
5365 return PTR_ERR(path); 5367 return PTR_ERR(path);
5366 depth = path->p_depth; 5368 depth = path->p_depth;
@@ -5398,7 +5400,8 @@ ext4_ext_shift_extents(struct inode *inode, handle_t *handle,
5398 * becomes NULL to indicate the end of the loop. 5400 * becomes NULL to indicate the end of the loop.
5399 */ 5401 */
5400 while (iterator && start <= stop) { 5402 while (iterator && start <= stop) {
5401 path = ext4_find_extent(inode, *iterator, &path, 0); 5403 path = ext4_find_extent(inode, *iterator, &path,
5404 EXT4_EX_NOCACHE);
5402 if (IS_ERR(path)) 5405 if (IS_ERR(path))
5403 return PTR_ERR(path); 5406 return PTR_ERR(path);
5404 depth = path->p_depth; 5407 depth = path->p_depth;