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

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

[XFS] kill xfs_freeze. 



No need to have a wrapper just two call two more functions.

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

Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDonald Douwsma <donaldd@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 10090be2

fs/xfs/linux-2.6/xfs_super.c

+10 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "xfs_rtalloc.h"

#include "xfs_error.h"

#include "xfs_itable.h"

#include "xfs_fsops.h"

#include "xfs_rw.h"

#include "xfs_acl.h"

#include "xfs_attr.h"
@@ -738,11 +739,19 @@ xfs_fs_remount( 
	return -error;

}



/*

 * Second stage of a freeze. The data is already frozen so we only

 * need to take care of themetadata. Once that's done write a dummy

 * record to dirty the log in case of a crash while frozen.

 */

STATIC void

xfs_fs_lockfs(

	struct super_block	*sb)

{

	xfs_freeze(XFS_M(sb));

	struct xfs_mount	*mp = XFS_M(sb);



	xfs_attr_quiesce(mp);

	xfs_fs_log_dummy(mp);

}



STATIC int

fs/xfs/xfs_vfsops.c

+1 −14
Original line number Diff line number Diff line
@@ -692,7 +692,7 @@ xfs_quiesce_fs( 
 * care of the metadata. New transactions are already blocked, so we need to

 * wait for any remaining transactions to drain out before proceding.

 */

STATIC void

void

xfs_attr_quiesce(

	xfs_mount_t	*mp)

{
@@ -1902,16 +1902,3 @@ xfs_showargs( 
		seq_puts(m, "," MNTOPT_DMAPI);

	return 0;

}
 


/*

 * Second stage of a freeze. The data is already frozen so we only

 * need to take care of themetadata. Once that's done write a dummy

 * record to dirty the log in case of a crash while frozen.

 */

void

xfs_freeze(

	xfs_mount_t	*mp)

{

	xfs_attr_quiesce(mp);

	xfs_fs_log_dummy(mp);

}

fs/xfs/xfs_vfsops.h

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ int xfs_vget(struct xfs_mount *mp, bhv_vnode_t **vpp, struct xfs_fid *xfid); 
int xfs_parseargs(struct xfs_mount *mp, char *options,

		struct xfs_mount_args *args, int update);

int xfs_showargs(struct xfs_mount *mp, struct seq_file *m);

void xfs_freeze(struct xfs_mount *mp);

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

		int lnnum);

void xfs_attr_quiesce(struct xfs_mount *mp);



#endif /* _XFS_VFSOPS_H */