--- src/sys/vfs/hammer/hammer_mount.h	2008/07/14 03:20:49	1.9
+++ src/sys/vfs/hammer/hammer_mount.h	2008/07/19 18:46:20	1.9.2.1
@@ -49,14 +49,14 @@ struct hammer_mount_info {
 	const char	**volumes;	/* array of pointers to device names */
 	int		nvolumes;	/* number of devices */
 	int		hflags;		/* extended hammer mount flags */
-	int		masterid;
+	int		master_id;	/* -1=no-mirror mode, or 0-15 */
 	u_int64_t	asof;		/* asof - HAMMER_MAX_TID is current */
 	struct export_args export;	/* export arguments */
 	u_int64_t	reserved[15];
 };
 
 #define HMNT_NOHISTORY	0x00000001
-#define HMNT_MASTERID	0x00000002	/* masterid field set */
+#define HMNT_MASTERID	0x00000002	/* master_id field set */
 #define HMNT_EXPORTREQ	0x00000004
 #define HMNT_UNDO_DIRTY	0x00000008