svn commit: r343347 - head/sys/geom/mirror

Conrad Meyer cem at FreeBSD.org
Wed Jan 23 16:44:22 UTC 2019


Author: cem
Date: Wed Jan 23 16:44:21 2019
New Revision: 343347
URL: https://svnweb.freebsd.org/changeset/base/343347

Log:
  gmirror: Relocate DEVICE_FLAGS to adjacent lines
  
  gmirror's sc_flags is shared between some on-disk state and some runtime
  only state.  There's no real reason for that and they could probably be
  split up.  Until they are, locate all of the flags for the same field
  nearby each other in the source, for clarity.
  
  No functional change.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/sys/geom/mirror/g_mirror.h

Modified: head/sys/geom/mirror/g_mirror.h
==============================================================================
--- head/sys/geom/mirror/g_mirror.h	Wed Jan 23 14:51:36 2019	(r343346)
+++ head/sys/geom/mirror/g_mirror.h	Wed Jan 23 16:44:21 2019	(r343347)
@@ -78,6 +78,12 @@
 					 G_MIRROR_DEVICE_FLAG_NOFAILSYNC)
 
 #ifdef _KERNEL
+#define	G_MIRROR_DEVICE_FLAG_DESTROY	0x0100000000000000ULL
+#define	G_MIRROR_DEVICE_FLAG_DRAIN	0x0200000000000000ULL
+#define	G_MIRROR_DEVICE_FLAG_CLOSEWAIT	0x0400000000000000ULL
+#define	G_MIRROR_DEVICE_FLAG_TASTING	0x0800000000000000ULL
+#define	G_MIRROR_DEVICE_FLAG_WIPE	0x1000000000000000ULL
+
 extern int g_mirror_debug;
 
 #define	G_MIRROR_DEBUG(lvl, ...)	do {				\
@@ -166,12 +172,6 @@ struct g_mirror_event {
 	int			 e_error;
 	TAILQ_ENTRY(g_mirror_event) e_next;
 };
-
-#define	G_MIRROR_DEVICE_FLAG_DESTROY	0x0100000000000000ULL
-#define	G_MIRROR_DEVICE_FLAG_DRAIN	0x0200000000000000ULL
-#define	G_MIRROR_DEVICE_FLAG_CLOSEWAIT	0x0400000000000000ULL
-#define	G_MIRROR_DEVICE_FLAG_TASTING	0x0800000000000000ULL
-#define	G_MIRROR_DEVICE_FLAG_WIPE	0x1000000000000000ULL
 
 #define	G_MIRROR_DEVICE_STATE_STARTING		0
 #define	G_MIRROR_DEVICE_STATE_RUNNING		1


More information about the svn-src-all mailing list