Просмотр исходного кода

Btrfs: fix off-by-one in fiemap

lock_extent/unlock_extent expect an exclusive end.

Tested-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Liu Bo 12 лет назад
Родитель
Сommit
a52f4cd2b1
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      fs/btrfs/extent_io.c

+ 2 - 2
fs/btrfs/extent_io.c

@@ -3989,7 +3989,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 		last_for_get_extent = isize;
 		last_for_get_extent = isize;
 	}
 	}
 
 
-	lock_extent_bits(&BTRFS_I(inode)->io_tree, start, start + len, 0,
+	lock_extent_bits(&BTRFS_I(inode)->io_tree, start, start + len - 1, 0,
 			 &cached_state);
 			 &cached_state);
 
 
 	em = get_extent_skip_holes(inode, start, last_for_get_extent,
 	em = get_extent_skip_holes(inode, start, last_for_get_extent,
@@ -4076,7 +4076,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 out_free:
 out_free:
 	free_extent_map(em);
 	free_extent_map(em);
 out:
 out:
-	unlock_extent_cached(&BTRFS_I(inode)->io_tree, start, start + len,
+	unlock_extent_cached(&BTRFS_I(inode)->io_tree, start, start + len - 1,
 			     &cached_state, GFP_NOFS);
 			     &cached_state, GFP_NOFS);
 	return ret;
 	return ret;
 }
 }