* [PATCH 1/2] kill xfs_freeze
@ 2007-09-25 19:45 Christoph Hellwig
2007-09-26 0:10 ` Donald Douwsma
0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2007-09-25 19:45 UTC (permalink / raw)
To: xfs
No need to have a wrapper just two call two more functions.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_super.c 2007-09-23 13:54:35.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c 2007-09-23 13:56:12.000000000 +0200
@@ -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"
@@ -684,11 +685,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
Index: linux-2.6-xfs/fs/xfs/xfs_vfsops.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_vfsops.c 2007-09-23 13:54:35.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_vfsops.c 2007-09-23 13:56:12.000000000 +0200
@@ -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)
{
Index: linux-2.6-xfs/fs/xfs/xfs_vfsops.h
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_vfsops.h 2007-09-23 13:56:16.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_vfsops.h 2007-09-23 13:56:34.000000000 +0200
@@ -21,8 +21,8 @@ int xfs_vget(struct xfs_mount *mp, bhv_v
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 */
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] kill xfs_freeze
2007-09-25 19:45 [PATCH 1/2] kill xfs_freeze Christoph Hellwig
@ 2007-09-26 0:10 ` Donald Douwsma
2007-09-26 8:23 ` Christoph Hellwig
0 siblings, 1 reply; 3+ messages in thread
From: Donald Douwsma @ 2007-09-26 0:10 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: xfs
Christoph Hellwig wrote:
> No need to have a wrapper just two call two more functions.
...
>
> Index: linux-2.6-xfs/fs/xfs/xfs_vfsops.c
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/xfs_vfsops.c 2007-09-23 13:54:35.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/xfs_vfsops.c 2007-09-23 13:56:12.000000000 +0200
> @@ -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)
> {
> Index: linux-2.6-xfs/fs/xfs/xfs_vfsops.h
> ===================================================================
> --- linux-2.6-xfs.orig/fs/xfs/xfs_vfsops.h 2007-09-23 13:56:16.000000000 +0200
> +++ linux-2.6-xfs/fs/xfs/xfs_vfsops.h 2007-09-23 13:56:34.000000000 +0200
This has removed all use of xfs_freeze, but I cant see a diff
hunk that removes the xfs_freeze implementation from xfs_vfsops.c
Don
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] kill xfs_freeze
2007-09-26 0:10 ` Donald Douwsma
@ 2007-09-26 8:23 ` Christoph Hellwig
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2007-09-26 8:23 UTC (permalink / raw)
To: Donald Douwsma; +Cc: Christoph Hellwig, xfs
> This has removed all use of xfs_freeze, but I cant see a diff
> hunk that removes the xfs_freeze implementation from xfs_vfsops.c
Looks like that hunk got lost in a merge. Here's an updated version
of the patch that actually removes xfs_freeze:
Index: linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/linux-2.6/xfs_super.c 2007-09-25 15:04:01.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/linux-2.6/xfs_super.c 2007-09-26 10:13:54.000000000 +0200
@@ -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"
@@ -684,11 +685,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
Index: linux-2.6-xfs/fs/xfs/xfs_vfsops.c
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_vfsops.c 2007-09-25 15:04:01.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_vfsops.c 2007-09-26 10:14:07.000000000 +0200
@@ -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)
{
@@ -1955,16 +1955,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);
-}
Index: linux-2.6-xfs/fs/xfs/xfs_vfsops.h
===================================================================
--- linux-2.6-xfs.orig/fs/xfs/xfs_vfsops.h 2007-09-25 15:04:01.000000000 +0200
+++ linux-2.6-xfs/fs/xfs/xfs_vfsops.h 2007-09-26 10:13:54.000000000 +0200
@@ -21,8 +21,8 @@ int xfs_vget(struct xfs_mount *mp, bhv_v
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 */
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-09-26 8:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-25 19:45 [PATCH 1/2] kill xfs_freeze Christoph Hellwig
2007-09-26 0:10 ` Donald Douwsma
2007-09-26 8:23 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox