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

Commit cbc89dcf authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[XFS] kill xfs_root 



The only caller (xfs_fs_fill_super) can simplify call igrab on the root
inode.

SGI-PV: 971186
SGI-Modid: xfs-linux-melb:xfs-kern:30393a

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 4188c78d

fs/xfs/linux-2.6/xfs_super.c

+4 −2
Original line number Diff line number Diff line
@@ -1344,9 +1344,11 @@ xfs_fs_fill_super( 
	sb->s_time_gran = 1;

	set_posix_acl_flag(sb);



	error = xfs_root(mp, &rootvp);

	if (error)

	rootvp = igrab(mp->m_rootip->i_vnode);

	if (!rootvp) {

		error = ENOENT;

		goto fail_unmount;

	}



	sb->s_root = d_alloc_root(vn_to_inode(rootvp));

	if (!sb->s_root) {

fs/xfs/xfs_vfsops.c

+0 −20
Original line number Diff line number Diff line
@@ -807,26 +807,6 @@ xfs_unmount_flush( 
	return XFS_ERROR(EFSCORRUPTED);

}



/*

 * xfs_root extracts the root vnode from a vfs.

 *

 * vfsp -- the vfs struct for the desired file system

 * vpp  -- address of the caller's vnode pointer which should be

 *         set to the desired fs root vnode

 */

int

xfs_root(

	xfs_mount_t	*mp,

	bhv_vnode_t	**vpp)

{

	bhv_vnode_t	*vp;



	vp = XFS_ITOV(mp->m_rootip);

	VN_HOLD(vp);

	*vpp = vp;

	return 0;

}



/*

 * xfs_sync flushes any pending I/O to file system vfsp.

 *

fs/xfs/xfs_vfsops.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ int xfs_mount(struct xfs_mount *mp, struct xfs_mount_args *args, 
int xfs_unmount(struct xfs_mount *mp, int flags, struct cred *credp);

int xfs_mntupdate(struct xfs_mount *mp, int *flags,

		struct xfs_mount_args *args);

int xfs_root(struct xfs_mount *mp, bhv_vnode_t **vpp);

int xfs_sync(struct xfs_mount *mp, int flags);

void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname,

		int lnnum);