From b55769889175e4599230c14e919e791fda18b5b8 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Wed, 3 Aug 2011 08:11:41 +0000 Subject: [PATCH] --- yaml --- r: 263098 b: refs/heads/master c: c97c2916e25c56e878e3e94efd449e2d688fcb31 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/ctree.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ea8ede5b57aa..06c2f73c23a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb1b69f4508a1e8c1a7907379eafceb7ae0325ef +refs/heads/master: c97c2916e25c56e878e3e94efd449e2d688fcb31 diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h index 884293642a6c..8b99c79ad1a7 100644 --- a/trunk/fs/btrfs/ctree.h +++ b/trunk/fs/btrfs/ctree.h @@ -1415,17 +1415,15 @@ void btrfs_set_##name(struct extent_buffer *eb, type *s, u##bits val); #define BTRFS_SETGET_HEADER_FUNCS(name, type, member, bits) \ static inline u##bits btrfs_##name(struct extent_buffer *eb) \ { \ - type *p = kmap_atomic(eb->first_page, KM_USER0); \ + type *p = page_address(eb->first_page); \ u##bits res = le##bits##_to_cpu(p->member); \ - kunmap_atomic(p, KM_USER0); \ return res; \ } \ static inline void btrfs_set_##name(struct extent_buffer *eb, \ u##bits val) \ { \ - type *p = kmap_atomic(eb->first_page, KM_USER0); \ + type *p = page_address(eb->first_page); \ p->member = cpu_to_le##bits(val); \ - kunmap_atomic(p, KM_USER0); \ } #define BTRFS_SETGET_STACK_FUNCS(name, type, member, bits) \