Skip to content

Commit

Permalink
[XFS] kill xfs_freeze.
Browse files Browse the repository at this point in the history
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: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Donald Douwsma <donaldd@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
  • Loading branch information
Christoph Hellwig authored and Lachlan McIlroy committed Feb 7, 2008
1 parent 10090be commit 9909c4a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
11 changes: 10 additions & 1 deletion fs/xfs/linux-2.6/xfs_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
15 changes: 1 addition & 14 deletions fs/xfs/xfs_vfsops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion fs/xfs/xfs_vfsops.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 9909c4a

Please sign in to comment.