svn commit: r351665 - in head: sys/fs/msdosfs usr.sbin/makefs usr.sbin/makefs/msdos

[Ed Maste]

Author: emaste
Date: Sun Sep  1 16:55:33 2019
New Revision: 351665
URL: https://svnweb.freebsd.org/changeset/base/351665

Log:
  makefs: share msdosfsmount.h between kernel msdosfs and makefs
  
  Sponsored by:	The FreeBSD Foundation

Deleted:
  head/usr.sbin/makefs/msdos/msdosfsmount.h
Modified:
  head/sys/fs/msdosfs/msdosfsmount.h
  head/usr.sbin/makefs/msdos.c
  head/usr.sbin/makefs/msdos/msdosfs_conv.c
  head/usr.sbin/makefs/msdos/msdosfs_denode.c
  head/usr.sbin/makefs/msdos/msdosfs_fat.c
  head/usr.sbin/makefs/msdos/msdosfs_lookup.c
  head/usr.sbin/makefs/msdos/msdosfs_vfsops.c
  head/usr.sbin/makefs/msdos/msdosfs_vnops.c

Modified: head/sys/fs/msdosfs/msdosfsmount.h
==============================================================================
--- head/sys/fs/msdosfs/msdosfsmount.h	Sun Sep  1 16:53:17 2019	(r351664)
+++ head/sys/fs/msdosfs/msdosfsmount.h	Sun Sep  1 16:55:33 2019	(r351665)
@@ -53,7 +53,7 @@
 #ifndef _MSDOSFS_MSDOSFSMOUNT_H_
 #define	_MSDOSFS_MSDOSFSMOUNT_H_
 
-#ifdef _KERNEL
+#if defined (_KERNEL) || defined(MAKEFS)
 
 #include <sys/types.h>
 #include <sys/lock.h>
@@ -224,6 +224,7 @@ struct msdosfs_fileno {
 
 #endif /* _KERNEL */
 
+#ifndef MAKEFS
 /*
  *  Arguments to mount MSDOS filesystems.
  */
@@ -241,6 +242,7 @@ struct msdosfs_args {
 	char	*cs_local;	/* Local Charset */
 	mode_t	dirmask;	/* dir  mask to be applied for msdosfs perms */
 };
+#endif /* MAKEFS */
 
 /*
  * Msdosfs mount options:

Modified: head/usr.sbin/makefs/msdos.c
==============================================================================
--- head/usr.sbin/makefs/msdos.c	Sun Sep  1 16:53:17 2019	(r351664)
+++ head/usr.sbin/makefs/msdos.c	Sun Sep  1 16:55:33 2019	(r351665)
@@ -63,9 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <fs/msdosfs/bpb.h>
 #include "msdos/direntry.h"
 #include <fs/msdosfs/denode.h>
-
-
-#include "msdos/msdosfsmount.h"
+#include <fs/msdosfs/msdosfsmount.h>
 
 static int msdos_populate_dir(const char *, struct denode *, fsnode *,
     fsnode *, fsinfo_t *);

Modified: head/usr.sbin/makefs/msdos/msdosfs_conv.c
==============================================================================
--- head/usr.sbin/makefs/msdos/msdosfs_conv.c	Sun Sep  1 16:53:17 2019	(r351664)
+++ head/usr.sbin/makefs/msdos/msdosfs_conv.c	Sun Sep  1 16:55:33 2019	(r351665)
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 
 #include <fs/msdosfs/bpb.h>
 #include "msdos/direntry.h"
-#include "msdos/msdosfsmount.h"
+#include <fs/msdosfs/msdosfsmount.h>
 
 #include "makefs.h"
 #include "msdos.h"

Modified: head/usr.sbin/makefs/msdos/msdosfs_denode.c
==============================================================================
--- head/usr.sbin/makefs/msdos/msdosfs_denode.c	Sun Sep  1 16:53:17 2019	(r351664)
+++ head/usr.sbin/makefs/msdos/msdosfs_denode.c	Sun Sep  1 16:55:33 2019	(r351665)
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <fs/msdosfs/direntry.h>
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
-#include "msdos/msdosfsmount.h"
+#include <fs/msdosfs/msdosfsmount.h>
 
 #include "makefs.h"
 #include "msdos.h"

Modified: head/usr.sbin/makefs/msdos/msdosfs_fat.c
==============================================================================
--- head/usr.sbin/makefs/msdos/msdosfs_fat.c	Sun Sep  1 16:53:17 2019	(r351664)
+++ head/usr.sbin/makefs/msdos/msdosfs_fat.c	Sun Sep  1 16:55:33 2019	(r351665)
@@ -64,7 +64,7 @@
 #include "msdos/direntry.h"
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
-#include "msdos/msdosfsmount.h"
+#include <fs/msdosfs/msdosfsmount.h>
 
 #include "makefs.h"
 #include "msdos.h"

Modified: head/usr.sbin/makefs/msdos/msdosfs_lookup.c
==============================================================================
--- head/usr.sbin/makefs/msdos/msdosfs_lookup.c	Sun Sep  1 16:53:17 2019	(r351664)
+++ head/usr.sbin/makefs/msdos/msdosfs_lookup.c	Sun Sep  1 16:55:33 2019	(r351665)
@@ -61,7 +61,7 @@
 #include "msdos/direntry.h"
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
-#include "msdos/msdosfsmount.h"
+#include <fs/msdosfs/msdosfsmount.h>
 
 #include "makefs.h"
 #include "msdos.h"

Modified: head/usr.sbin/makefs/msdos/msdosfs_vfsops.c
==============================================================================
--- head/usr.sbin/makefs/msdos/msdosfs_vfsops.c	Sun Sep  1 16:53:17 2019	(r351664)
+++ head/usr.sbin/makefs/msdos/msdosfs_vfsops.c	Sun Sep  1 16:55:33 2019	(r351665)
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #include "msdos/direntry.h"
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
-#include "msdos/msdosfsmount.h"
+#include <fs/msdosfs/msdosfsmount.h>
 
 #include <mkfs_msdos.h>
 

Modified: head/usr.sbin/makefs/msdos/msdosfs_vnops.c
==============================================================================
--- head/usr.sbin/makefs/msdos/msdosfs_vnops.c	Sun Sep  1 16:53:17 2019	(r351664)
+++ head/usr.sbin/makefs/msdos/msdosfs_vnops.c	Sun Sep  1 16:55:33 2019	(r351665)
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
 #include "msdos/direntry.h"
 #include <fs/msdosfs/denode.h>
 #include <fs/msdosfs/fat.h>
-#include "msdos/msdosfsmount.h"
+#include <fs/msdosfs/msdosfsmount.h>
 
 #include "makefs.h"
 #include "msdos.h"