From bb8523b18fd6f7896f3921fa8988dd8c3da2616e Mon Sep 17 00:00:00 2001
From: Robin Dong <sanbai@taobao.com>
Date: Sat, 29 Sep 2012 02:07:47 -0600
Subject: [PATCH] --- yaml --- r: 332603 b: refs/heads/master c:
 479ed9abdbeec5d9ed0005f3bee9c9bc06a102bb h: refs/heads/master i:   332601:
 434fc3ff88ae21bdba3b8250eff383b5a60450d9   332599:
 e1857a1e29abe52669817f300aa158f7b34ccbe4 v: v3

---
 [refs]                     |  2 +-
 trunk/fs/btrfs/extent_io.c | 12 ------------
 trunk/fs/btrfs/extent_io.h | 14 ++++++++++++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 07c892a7cb66..f54de76db869 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a2d6a64645b38d7040bbd031c7a7b2655f5d976
+refs/heads/master: 479ed9abdbeec5d9ed0005f3bee9c9bc06a102bb
diff --git a/trunk/fs/btrfs/extent_io.c b/trunk/fs/btrfs/extent_io.c
index 67fe401c3209..b82d244a2ef5 100644
--- a/trunk/fs/btrfs/extent_io.c
+++ b/trunk/fs/btrfs/extent_io.c
@@ -3986,18 +3986,6 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 	return ret;
 }
 
-inline struct page *extent_buffer_page(struct extent_buffer *eb,
-					      unsigned long i)
-{
-	return eb->pages[i];
-}
-
-inline unsigned long num_extent_pages(u64 start, u64 len)
-{
-	return ((start + len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) -
-		(start >> PAGE_CACHE_SHIFT);
-}
-
 static void __free_extent_buffer(struct extent_buffer *eb)
 {
 #if LEAK_DEBUG
diff --git a/trunk/fs/btrfs/extent_io.h b/trunk/fs/btrfs/extent_io.h
index 7aeb31087f88..711d12b80028 100644
--- a/trunk/fs/btrfs/extent_io.h
+++ b/trunk/fs/btrfs/extent_io.h
@@ -282,8 +282,18 @@ void free_extent_buffer_stale(struct extent_buffer *eb);
 int read_extent_buffer_pages(struct extent_io_tree *tree,
 			     struct extent_buffer *eb, u64 start, int wait,
 			     get_extent_t *get_extent, int mirror_num);
-unsigned long num_extent_pages(u64 start, u64 len);
-struct page *extent_buffer_page(struct extent_buffer *eb, unsigned long i);
+
+static inline unsigned long num_extent_pages(u64 start, u64 len)
+{
+	return ((start + len + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT) -
+		(start >> PAGE_CACHE_SHIFT);
+}
+
+static inline struct page *extent_buffer_page(struct extent_buffer *eb,
+					      unsigned long i)
+{
+	return eb->pages[i];
+}
 
 static inline void extent_buffer_get(struct extent_buffer *eb)
 {