diff options
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.h | 8 | ||||
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h index de9dc747b451..ad7fbead4c97 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.h +++ b/fs/xfs/linux-2.6/xfs_vnode.h | |||
@@ -50,14 +50,6 @@ struct attrlist_cursor_kern; | |||
50 | the operation completes. */ | 50 | the operation completes. */ |
51 | 51 | ||
52 | /* | 52 | /* |
53 | * Dealing with bad inodes | ||
54 | */ | ||
55 | static inline int VN_BAD(struct inode *vp) | ||
56 | { | ||
57 | return is_bad_inode(vp); | ||
58 | } | ||
59 | |||
60 | /* | ||
61 | * Some useful predicates. | 53 | * Some useful predicates. |
62 | */ | 54 | */ |
63 | #define VN_MAPPED(vp) mapping_mapped(vp->i_mapping) | 55 | #define VN_MAPPED(vp) mapping_mapped(vp->i_mapping) |
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 59de04954bc8..6e28461e7611 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -1136,7 +1136,7 @@ xfs_inactive( | |||
1136 | * If the inode is already free, then there can be nothing | 1136 | * If the inode is already free, then there can be nothing |
1137 | * to clean up here. | 1137 | * to clean up here. |
1138 | */ | 1138 | */ |
1139 | if (ip->i_d.di_mode == 0 || VN_BAD(VFS_I(ip))) { | 1139 | if (ip->i_d.di_mode == 0 || is_bad_inode(VFS_I(ip))) { |
1140 | ASSERT(ip->i_df.if_real_bytes == 0); | 1140 | ASSERT(ip->i_df.if_real_bytes == 0); |
1141 | ASSERT(ip->i_df.if_broot_bytes == 0); | 1141 | ASSERT(ip->i_df.if_broot_bytes == 0); |
1142 | return VN_INACTIVE_CACHE; | 1142 | return VN_INACTIVE_CACHE; |
@@ -2448,7 +2448,7 @@ xfs_reclaim( | |||
2448 | ASSERT(!VN_MAPPED(VFS_I(ip))); | 2448 | ASSERT(!VN_MAPPED(VFS_I(ip))); |
2449 | 2449 | ||
2450 | /* bad inode, get out here ASAP */ | 2450 | /* bad inode, get out here ASAP */ |
2451 | if (VN_BAD(VFS_I(ip))) { | 2451 | if (is_bad_inode(VFS_I(ip))) { |
2452 | xfs_ireclaim(ip); | 2452 | xfs_ireclaim(ip); |
2453 | return 0; | 2453 | return 0; |
2454 | } | 2454 | } |