[PATCH 6/7] xfs: kill VN_BAD

Christoph Hellwig
2009-02-20T08:53:02Z

[-- Attachment #1: xfs-kill-VN_BAD --]
[-- Type: text/plain, Size: 1578 bytes --]

Remove this rather pointless wrapper and use is_bad_inode directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfs/fs/xfs/linux-2.6/xfs_vnode.h
===================================================================
--- xfs.orig/fs/xfs/linux-2.6/xfs_vnode.h 2009-02-03 17:41:55.249436184 +0100
+++ xfs/fs/xfs/linux-2.6/xfs_vnode.h 2009-02-03 17:42:24.938561825 +0100
@@ -50,14 +50,6 @@ struct attrlist_cursor_kern;
the operation completes. */

/*
- * Dealing with bad inodes
- */
-static inline int VN_BAD(struct inode *vp)
-{
- return is_bad_inode(vp);
-}
-
-/*
* Some useful predicates.
*/
#define VN_MAPPED(vp) mapping_mapped(vp->i_mapping)
Index: xfs/fs/xfs/xfs_vnodeops.c
===================================================================
--- xfs.orig/fs/xfs/xfs_vnodeops.c 2009-02-03 17:41:55.261436104 +0100
+++ xfs/fs/xfs/xfs_vnodeops.c 2009-02-03 17:42:10.690562980 +0100
@@ -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;
}