Skip to content

Commit db3756c

Browse files
committed
btrfs: remove unused map_private_extent_buffer
All uses of map_private_extent_buffer have been replaced by more effective way. The set/get helpers have their own bounds checker. The function name was confusing since the non-private helper was removed in a659171 ("Btrfs: stop using highmem for extent_buffers") many years ago. Reviewed-by: Johannes Thumshirn <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 5cd17f3 commit db3756c

File tree

2 files changed

+0
-46
lines changed

2 files changed

+0
-46
lines changed

fs/btrfs/extent_io.c

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5685,48 +5685,6 @@ int read_extent_buffer_to_user(const struct extent_buffer *eb,
56855685
return ret;
56865686
}
56875687

5688-
/*
5689-
* return 0 if the item is found within a page.
5690-
* return 1 if the item spans two pages.
5691-
* return -EINVAL otherwise.
5692-
*/
5693-
int map_private_extent_buffer(const struct extent_buffer *eb,
5694-
unsigned long start, unsigned long min_len,
5695-
char **map, unsigned long *map_start,
5696-
unsigned long *map_len)
5697-
{
5698-
size_t offset;
5699-
char *kaddr;
5700-
struct page *p;
5701-
size_t start_offset = offset_in_page(eb->start);
5702-
unsigned long i = (start_offset + start) >> PAGE_SHIFT;
5703-
unsigned long end_i = (start_offset + start + min_len - 1) >>
5704-
PAGE_SHIFT;
5705-
5706-
if (start + min_len > eb->len) {
5707-
WARN(1, KERN_ERR "btrfs bad mapping eb start %llu len %lu, wanted %lu %lu\n",
5708-
eb->start, eb->len, start, min_len);
5709-
return -EINVAL;
5710-
}
5711-
5712-
if (i != end_i)
5713-
return 1;
5714-
5715-
if (i == 0) {
5716-
offset = start_offset;
5717-
*map_start = 0;
5718-
} else {
5719-
offset = 0;
5720-
*map_start = ((u64)i << PAGE_SHIFT) - start_offset;
5721-
}
5722-
5723-
p = eb->pages[i];
5724-
kaddr = page_address(p);
5725-
*map = kaddr + offset;
5726-
*map_len = PAGE_SIZE - offset;
5727-
return 0;
5728-
}
5729-
57305688
int memcmp_extent_buffer(const struct extent_buffer *eb, const void *ptrv,
57315689
unsigned long start, unsigned long len)
57325690
{

fs/btrfs/extent_io.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,6 @@ bool set_extent_buffer_dirty(struct extent_buffer *eb);
271271
void set_extent_buffer_uptodate(struct extent_buffer *eb);
272272
void clear_extent_buffer_uptodate(struct extent_buffer *eb);
273273
int extent_buffer_under_io(struct extent_buffer *eb);
274-
int map_private_extent_buffer(const struct extent_buffer *eb,
275-
unsigned long offset, unsigned long min_len,
276-
char **map, unsigned long *map_start,
277-
unsigned long *map_len);
278274
void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end);
279275
void extent_range_redirty_for_io(struct inode *inode, u64 start, u64 end);
280276
void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,

0 commit comments

Comments
 (0)