Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d948709b authored by Ben Myers's avatar Ben Myers
Browse files

xfs: remove usage of is_bad_inode 



XFS never calls mark_inode_bad or iget_failed, so it will never see a
bad inode.  Remove all checks for is_bad_inode because they are
unnecessary.

Signed-off-by: default avatarBen Myers <bpm@sgi.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 17ec81c1

fs/xfs/xfs_icache.c

+0 −7
Original line number Diff line number Diff line
@@ -500,11 +500,6 @@ xfs_inode_ag_walk_grab( 
	if (!igrab(inode))

		return ENOENT;



	if (is_bad_inode(inode)) {

		IRELE(ip);

		return ENOENT;

	}



	/* inode is valid */

	return 0;
@@ -918,8 +913,6 @@ xfs_reclaim_inode( 
		xfs_iflock(ip);

	}



	if (is_bad_inode(VFS_I(ip)))

		goto reclaim;

	if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {

		xfs_iunpin_wait(ip);

		xfs_iflush_abort(ip, false);

fs/xfs/xfs_inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1687,7 +1687,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 || is_bad_inode(VFS_I(ip))) {

	if (ip->i_d.di_mode == 0) {

		ASSERT(ip->i_df.if_real_bytes == 0);

		ASSERT(ip->i_df.if_broot_bytes == 0);

		return VN_INACTIVE_CACHE;

fs/xfs/xfs_super.c

+0 −9
Original line number Diff line number Diff line
@@ -946,10 +946,6 @@ xfs_fs_destroy_inode( 


	XFS_STATS_INC(vn_reclaim);



	/* bad inode, get out here ASAP */

	if (is_bad_inode(inode))

		goto out_reclaim;



	ASSERT(XFS_FORCED_SHUTDOWN(ip->i_mount) || ip->i_delayed_blks == 0);



	/*
@@ -965,7 +961,6 @@ xfs_fs_destroy_inode( 
	 * this more efficiently than we can here, so simply let background

	 * reclaim tear down all inodes.

	 */

out_reclaim:

	xfs_inode_set_reclaim_tag(ip);

}
@@ -1491,10 +1486,6 @@ xfs_fs_fill_super( 
		error = ENOENT;

		goto out_unmount;

	}

	if (is_bad_inode(root)) {

		error = EINVAL;

		goto out_unmount;

	}

	sb->s_root = d_make_root(root);

	if (!sb->s_root) {

		error = ENOMEM;