From b9672c4a338aebca0bd8dc35764c1cb5f65545ae Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 16 Mar 2009 08:25:25 +0100
Subject: [PATCH] --- yaml --- r: 140124 b: refs/heads/master c:
 cb4c8cc1e92bc68c952e9a81a9fb9736bd8150de h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7576a90b5329..1e2833de3d11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fab451e3cfe02a5e3dfc4bab3cfb975bc11fc09
+refs/heads/master: cb4c8cc1e92bc68c952e9a81a9fb9736bd8150de
diff --git a/trunk/fs/xfs/linux-2.6/xfs_vnode.h b/trunk/fs/xfs/linux-2.6/xfs_vnode.h
index de9dc747b451..ad7fbead4c97 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/trunk/fs/xfs/linux-2.6/xfs_vnode.h
@@ -49,14 +49,6 @@ struct attrlist_cursor_kern;
 					   Prevent VM access to the pages until
 					   the operation completes. */
 
-/*
- * Dealing with bad inodes
- */
-static inline int VN_BAD(struct inode *vp)
-{
-	return is_bad_inode(vp);
-}
-
 /*
  * Some useful predicates.
  */
diff --git a/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c
index 59de04954bc8..6e28461e7611 100644
--- a/trunk/fs/xfs/xfs_vnodeops.c
+++ b/trunk/fs/xfs/xfs_vnodeops.c
@@ -1136,7 +1136,7 @@ xfs_inactive(
 	 * If the inode is already free, then there can be nothing
 	 * to clean up here.
 	 */
-	if (ip->i_d.di_mode == 0 || VN_BAD(VFS_I(ip))) {
+	if (ip->i_d.di_mode == 0 || is_bad_inode(VFS_I(ip))) {
 		ASSERT(ip->i_df.if_real_bytes == 0);
 		ASSERT(ip->i_df.if_broot_bytes == 0);
 		return VN_INACTIVE_CACHE;
@@ -2448,7 +2448,7 @@ xfs_reclaim(
 	ASSERT(!VN_MAPPED(VFS_I(ip)));
 
 	/* bad inode, get out here ASAP */
-	if (VN_BAD(VFS_I(ip))) {
+	if (is_bad_inode(VFS_I(ip))) {
 		xfs_ireclaim(ip);
 		return 0;
 	}