From 2d6c403ced53412e841b25e87eed5a2798f4e5fc Mon Sep 17 00:00:00 2001
From: Dave Chinner <david@fromorbit.com>
Date: Mon, 14 Dec 2009 23:11:57 +0000
Subject: [PATCH] --- yaml --- r: 177677 b: refs/heads/master c:
 3fc98b1ac036675b95f6e3fafd5ef147b97d4d30 h: refs/heads/master i:   177675:
 fb65ddd03a66c46f31000a2701b5f2198300722e v: v3

---
 [refs]                           | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_buf.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1f68c4e63e11..5ab8ea4f9579 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5f9be58c2b87106100a6053d09b1f9f8d551c6e
+refs/heads/master: 3fc98b1ac036675b95f6e3fafd5ef147b97d4d30
diff --git a/trunk/fs/xfs/linux-2.6/xfs_buf.c b/trunk/fs/xfs/linux-2.6/xfs_buf.c
index 162359b664ca..77b8be81c769 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_buf.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_buf.c
@@ -292,6 +292,7 @@ _xfs_buf_free_pages(
 {
 	if (bp->b_pages != bp->b_page_array) {
 		kmem_free(bp->b_pages);
+		bp->b_pages = NULL;
 	}
 }
 
@@ -323,9 +324,8 @@ xfs_buf_free(
 				ASSERT(!PagePrivate(page));
 			page_cache_release(page);
 		}
-		_xfs_buf_free_pages(bp);
 	}
-
+	_xfs_buf_free_pages(bp);
 	xfs_buf_deallocate(bp);
 }