Skip to content

L
linux-davinci
Commit ae5252bd authored by Chris Mason's avatar Chris Mason
Browse files
Options

Btrfs: Go back to kmaps instead of page_address in extent_buffers 

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 6d36dcd4
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 31 deletions
fs/btrfs/extent_map.c
View file @ ae5252bd
...@@ -1867,7 +1867,6 @@ sector_t extent_bmap(struct address_space *mapping, sector_t iblock, ...@@ -1867,7 +1867,6 @@ sector_t extent_bmap(struct address_space *mapping, sector_t iblock,
if (!em || IS_ERR(em)) if (!em || IS_ERR(em))
return 0; return 0;
// XXX(hch): block 0 is valid in some cases, e.g. XFS RT device
if (em->block_start == EXTENT_MAP_INLINE || if (em->block_start == EXTENT_MAP_INLINE ||
em->block_start == EXTENT_MAP_HOLE) em->block_start == EXTENT_MAP_HOLE)
return 0; return 0;
...@@ -2199,10 +2198,9 @@ void read_extent_buffer(struct extent_buffer *eb, void *dstv, ...@@ -2199,10 +2198,9 @@ void read_extent_buffer(struct extent_buffer *eb, void *dstv,
WARN_ON(!PageUptodate(page)); WARN_ON(!PageUptodate(page));
cur = min(len, (PAGE_CACHE_SIZE - offset)); cur = min(len, (PAGE_CACHE_SIZE - offset));
// kaddr = kmap_atomic(page, KM_USER0); kaddr = kmap_atomic(page, KM_USER0);
kaddr = page_address(page);
memcpy(dst, kaddr + offset, cur); memcpy(dst, kaddr + offset, cur);
// kunmap_atomic(kaddr, KM_USER0); kunmap_atomic(kaddr, KM_USER0);
dst += cur; dst += cur;
len -= cur; len -= cur;
...@@ -2237,8 +2235,7 @@ int map_extent_buffer(struct extent_buffer *eb, unsigned long start, ...@@ -2237,8 +2235,7 @@ int map_extent_buffer(struct extent_buffer *eb, unsigned long start,
*map_start = (i << PAGE_CACHE_SHIFT) - start_offset; *map_start = (i << PAGE_CACHE_SHIFT) - start_offset;
} }
// kaddr = kmap_atomic(eb->pages[i], km); kaddr = kmap_atomic(extent_buffer_page(eb, i), km);
kaddr = page_address(extent_buffer_page(eb, i));
*token = kaddr; *token = kaddr;
*map = kaddr + offset; *map = kaddr + offset;
*map_len = PAGE_CACHE_SIZE - offset; *map_len = PAGE_CACHE_SIZE - offset;
...@@ -2248,7 +2245,7 @@ EXPORT_SYMBOL(map_extent_buffer); ...@@ -2248,7 +2245,7 @@ EXPORT_SYMBOL(map_extent_buffer);
void unmap_extent_buffer(struct extent_buffer *eb, char *token, int km) void unmap_extent_buffer(struct extent_buffer *eb, char *token, int km)
{ {
// kunmap_atomic(token, km); kunmap_atomic(token, km);
} }
EXPORT_SYMBOL(unmap_extent_buffer); EXPORT_SYMBOL(unmap_extent_buffer);
...@@ -2278,10 +2275,9 @@ int memcmp_extent_buffer(struct extent_buffer *eb, const void *ptrv, ...@@ -2278,10 +2275,9 @@ int memcmp_extent_buffer(struct extent_buffer *eb, const void *ptrv,
cur = min(len, (PAGE_CACHE_SIZE - offset)); cur = min(len, (PAGE_CACHE_SIZE - offset));
// kaddr = kmap_atomic(page, KM_USER0); kaddr = kmap_atomic(page, KM_USER0);
kaddr = page_address(page);
ret = memcmp(ptr, kaddr + offset, cur); ret = memcmp(ptr, kaddr + offset, cur);
// kunmap_atomic(kaddr, KM_USER0); kunmap_atomic(kaddr, KM_USER0);
if (ret) if (ret)
break; break;
...@@ -2317,10 +2313,9 @@ void write_extent_buffer(struct extent_buffer *eb, const void *srcv, ...@@ -2317,10 +2313,9 @@ void write_extent_buffer(struct extent_buffer *eb, const void *srcv,
WARN_ON(!PageUptodate(page)); WARN_ON(!PageUptodate(page));
cur = min(len, PAGE_CACHE_SIZE - offset); cur = min(len, PAGE_CACHE_SIZE - offset);
// kaddr = kmap_atomic(page, KM_USER0); kaddr = kmap_atomic(page, KM_USER0);
kaddr = page_address(page);
memcpy(kaddr + offset, src, cur); memcpy(kaddr + offset, src, cur);
// kunmap_atomic(kaddr, KM_USER0); kunmap_atomic(kaddr, KM_USER0);
src += cur; src += cur;
len -= cur; len -= cur;
...@@ -2352,10 +2347,9 @@ void memset_extent_buffer(struct extent_buffer *eb, char c, ...@@ -2352,10 +2347,9 @@ void memset_extent_buffer(struct extent_buffer *eb, char c,
WARN_ON(!PageUptodate(page)); WARN_ON(!PageUptodate(page));
cur = min(len, PAGE_CACHE_SIZE - offset); cur = min(len, PAGE_CACHE_SIZE - offset);
// kaddr = kmap_atomic(page, KM_USER0); kaddr = kmap_atomic(page, KM_USER0);
kaddr = page_address(page);
memset(kaddr + offset, c, cur); memset(kaddr + offset, c, cur);
// kunmap_atomic(kaddr, KM_USER0); kunmap_atomic(kaddr, KM_USER0);
len -= cur; len -= cur;
offset = 0; offset = 0;
...@@ -2388,10 +2382,9 @@ void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src, ...@@ -2388,10 +2382,9 @@ void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,
cur = min(len, (unsigned long)(PAGE_CACHE_SIZE - offset)); cur = min(len, (unsigned long)(PAGE_CACHE_SIZE - offset));
// kaddr = kmap_atomic(page, KM_USER1); kaddr = kmap_atomic(page, KM_USER1);
kaddr = page_address(page);
read_extent_buffer(src, kaddr + offset, src_offset, cur); read_extent_buffer(src, kaddr + offset, src_offset, cur);
// kunmap_atomic(kaddr, KM_USER1); kunmap_atomic(kaddr, KM_USER1);
src_offset += cur; src_offset += cur;
len -= cur; len -= cur;
...@@ -2405,43 +2398,38 @@ static void move_pages(struct page *dst_page, struct page *src_page, ...@@ -2405,43 +2398,38 @@ static void move_pages(struct page *dst_page, struct page *src_page,
unsigned long dst_off, unsigned long src_off, unsigned long dst_off, unsigned long src_off,
unsigned long len) unsigned long len)
{ {
// char *dst_kaddr = kmap_atomic(dst_page, KM_USER0); char *dst_kaddr = kmap_atomic(dst_page, KM_USER0);
char *dst_kaddr = page_address(dst_page);
if (dst_page == src_page) { if (dst_page == src_page) {
memmove(dst_kaddr + dst_off, dst_kaddr + src_off, len); memmove(dst_kaddr + dst_off, dst_kaddr + src_off, len);
} else { } else {
// char *src_kaddr = kmap_atomic(src_page, KM_USER1); char *src_kaddr = kmap_atomic(src_page, KM_USER1);
char *src_kaddr = page_address(src_page);
char *p = dst_kaddr + dst_off + len; char *p = dst_kaddr + dst_off + len;
char *s = src_kaddr + src_off + len; char *s = src_kaddr + src_off + len;
while (len--) while (len--)
*--p = *--s; *--p = *--s;
// kunmap_atomic(src_kaddr, KM_USER1); kunmap_atomic(src_kaddr, KM_USER1);
} }
// kunmap_atomic(dst_kaddr, KM_USER0); kunmap_atomic(dst_kaddr, KM_USER0);
} }
static void copy_pages(struct page *dst_page, struct page *src_page, static void copy_pages(struct page *dst_page, struct page *src_page,
unsigned long dst_off, unsigned long src_off, unsigned long dst_off, unsigned long src_off,
unsigned long len) unsigned long len)
{ {
//kmap_atomic(dst_page, KM_USER0); char *dst_kaddr = kmap_atomic(dst_page, KM_USER0);
char *dst_kaddr = page_address(dst_page);
char *src_kaddr; char *src_kaddr;
if (dst_page != src_page) if (dst_page != src_page)
src_kaddr = page_address(src_page); // kmap_atomic(src_page, KM_USER1); src_kaddr = kmap_atomic(src_page, KM_USER1);
else else
src_kaddr = dst_kaddr; src_kaddr = dst_kaddr;
memcpy(dst_kaddr + dst_off, src_kaddr + src_off, len); memcpy(dst_kaddr + dst_off, src_kaddr + src_off, len);
/*
kunmap_atomic(dst_kaddr, KM_USER0); kunmap_atomic(dst_kaddr, KM_USER0);
if (dst_page != src_page) if (dst_page != src_page)
kunmap_atomic(src_kaddr, KM_USER1); kunmap_atomic(src_kaddr, KM_USER1);
*/
} }
void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
...@@ -2537,7 +2525,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset, ...@@ -2537,7 +2525,7 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
cur = min(len, src_off_in_page + 1); cur = min(len, src_off_in_page + 1);
cur = min(cur, dst_off_in_page + 1); cur = min(cur, dst_off_in_page + 1);
// printk("move pages orig dst %lu src %lu len %lu, this %lu %lu %lu\n", dst_offset, src_offset, len, dst_off_in_page - cur + 1, src_off_in_page - cur + 1, cur);
move_pages(extent_buffer_page(dst, dst_i), move_pages(extent_buffer_page(dst, dst_i),
extent_buffer_page(dst, src_i), extent_buffer_page(dst, src_i),
dst_off_in_page - cur + 1, dst_off_in_page - cur + 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment