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

Commit f95099ba authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Niv Sardi
Browse files

kill xfs_unmount_flush 



There's almost nothing left in this function, instead remove the IRELE
on the real times inodes and the call to XFS_QM_UNMOUNT into xfs_unmountfs.

For the regular unmount case that means it now also happenes after dmapi
notification, but otherwise there is no difference in behaviour.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarNiv Sardi <xaiki@sgi.com>
parent e57481dc

fs/xfs/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ xfs-y += xfs_alloc.o \ 
				   xfs_trans_inode.o \

				   xfs_trans_item.o \

				   xfs_utils.o \

				   xfs_vfsops.o \

				   xfs_vnodeops.o \

				   xfs_rw.o \

				   xfs_dmops.o \

fs/xfs/linux-2.6/xfs_super.c

+0 −5
Original line number Diff line number Diff line
@@ -1043,7 +1043,6 @@ xfs_fs_put_super( 
	struct xfs_mount	*mp = XFS_M(sb);

	struct xfs_inode	*rip = mp->m_rootip;

	int			unmount_event_flags = 0;

	int			error;



	xfs_syncd_stop(mp);

	xfs_sync_inodes(mp, SYNC_ATTR|SYNC_DELWRI);
@@ -1071,8 +1070,6 @@ xfs_fs_put_super( 
	xfs_filestream_unmount(mp);



	XFS_bflush(mp->m_ddev_targp);

	error = xfs_unmount_flush(mp, 0);

	WARN_ON(error);



	if (mp->m_flags & XFS_MOUNT_DMAPI) {

		XFS_SEND_UNMOUNT(mp, rip, DM_RIGHT_NULL, 0, 0,
@@ -1535,8 +1532,6 @@ xfs_fs_fill_super( 
	xfs_filestream_unmount(mp);



	XFS_bflush(mp->m_ddev_targp);

	error = xfs_unmount_flush(mp, 0);

	WARN_ON(error);



	xfs_unmountfs(mp);

	goto out_free_sb;

fs/xfs/xfs_mount.c

+10 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,16 @@ xfs_unmountfs( 
	__uint64_t		resblks;

	int			error;



	/*

	 * Release dquot that rootinode, rbmino and rsumino might be holding,

	 * and release the quota inodes.

	 */

	XFS_QM_UNMOUNT(mp);



	if (mp->m_rbmip)

		IRELE(mp->m_rbmip);

	if (mp->m_rsumip)

		IRELE(mp->m_rsumip);

	IRELE(mp->m_rootip);



	/*

fs/xfs/xfs_mount.h

+0 −1
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ extern void xfs_mountfs_check_barriers(xfs_mount_t *mp); 


extern void	xfs_unmountfs(xfs_mount_t *);

extern int	xfs_unmountfs_writesb(xfs_mount_t *);

extern int	xfs_unmount_flush(xfs_mount_t *, int);

extern int	xfs_mod_incore_sb(xfs_mount_t *, xfs_sb_field_t, int64_t, int);

extern int	xfs_mod_incore_sb_unlocked(xfs_mount_t *, xfs_sb_field_t,

			int64_t, int);

fs/xfs/xfs_vfsops.c

deleted100644 → 0
+0 −83
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2000-2005 Silicon Graphics, Inc.

 * All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it would be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write the Free Software Foundation,

 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_types.h"

#include "xfs_bit.h"

#include "xfs_log.h"

#include "xfs_inum.h"

#include "xfs_trans.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_dir2.h"

#include "xfs_dmapi.h"

#include "xfs_mount.h"

#include "xfs_da_btree.h"

#include "xfs_bmap_btree.h"

#include "xfs_ialloc_btree.h"

#include "xfs_alloc_btree.h"

#include "xfs_dir2_sf.h"

#include "xfs_attr_sf.h"

#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_inode_item.h"

#include "xfs_btree.h"

#include "xfs_alloc.h"

#include "xfs_ialloc.h"

#include "xfs_quota.h"

#include "xfs_error.h"

#include "xfs_bmap.h"

#include "xfs_rw.h"

#include "xfs_buf_item.h"

#include "xfs_log_priv.h"

#include "xfs_dir2_trace.h"

#include "xfs_extfree_item.h"

#include "xfs_acl.h"

#include "xfs_attr.h"

#include "xfs_mru_cache.h"

#include "xfs_filestream.h"

#include "xfs_fsops.h"

#include "xfs_vnodeops.h"

#include "xfs_utils.h"

#include "xfs_sync.h"





/*

 * xfs_unmount_flush implements a set of flush operation on special

 * inodes, which are needed as a separate set of operations so that

 * they can be called as part of relocation process.

 */

int

xfs_unmount_flush(

	xfs_mount_t	*mp,		/* Mount structure we are getting

					   rid of. */

	int             relocation)	/* Called from vfs relocation. */

{

	/*

	 * Release dquot that rootinode, rbmino and rsumino might be holding,

	 * flush and purge the quota inodes.

	 */

	XFS_QM_UNMOUNT(mp);



	if (mp->m_rbmip)

		IRELE(mp->m_rbmip);

	if (mp->m_rsumip)

		IRELE(mp->m_rsumip);



	return 0;

}