Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Feb 1999 07:22:07 +0100 (CET)
From:      Andre Albsmeier <andre.albsmeier@mchp.siemens.de>
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   bin/10044: amd in 3.1-BETA fails on ufs (Fix included)
Message-ID:  <199902120622.HAA01204@internal>

next in thread | raw e-mail | index | archive | help


>Number:         10044
>Category:       bin
>Synopsis:       amd in 3.1-BETA fails on ufs (Fix included)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 11 22:30:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Andre Albsmeier
>Release:        FreeBSD 3.1-BETA i386
>Organization:
>Environment:

FreeBSD 3.1-BETA, I assume -current also


>Description:

amd on 3.1-BETA fails to mount an ufs. This is because ufs_args_t
defaults to u_int if it hasn't been redefined in config.h. However,
this definition has been forgotten. We also have to change the
location from where ufs_mount.h is included.

Below is a patch which corrects this problem. Please review it in
case I have forgotten other things since I am no amd expert :-).
 
I assume the same problem appears in -current but I haven't
looked yet.


>How-To-Repeat:

Try to mount an ufs with amd on 3.1.

>Fix:
	
--- usr.sbin/amd/include/config.h.ORI	Fri Feb 12 06:57:54 1999
+++ usr.sbin/amd/include/config.h	Fri Feb 12 07:06:05 1999
@@ -753,7 +753,7 @@
 /* #undef HAVE_FIELD_UFS_ARGS_T_FLAGS */
 
 /* does ufs_args_t have fspec field? */
-/* #undef HAVE_FIELD_UFS_ARGS_T_FSPEC */
+#define HAVE_FIELD_UFS_ARGS_T_FSPEC 1
 
 /* does efs_args_t have flags field? */
 /* #undef HAVE_FIELD_EFS_ARGS_T_FLAGS */
@@ -1038,7 +1038,7 @@
 /* #undef tmpfs_args_t */
 
 /* Define a type for the ufs_args structure */
-/* #undef ufs_args_t */
+#define ufs_args_t struct ufs_args
 
 /* Define a type for the efs_args structure */
 /* #undef efs_args_t */
@@ -1829,7 +1829,7 @@
 /* #undef HAVE_TMPFS_TMP_H */
 
 /* Define if you have the <ufs/ufs_mount.h> header file.  */
-/* #undef HAVE_UFS_UFS_MOUNT_H */
+#define HAVE_UFS_UFS_MOUNT_H 1
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
--- contrib/amd/include/am_defs.h.ORI	Sun Jan 31 11:44:50 1999
+++ contrib/amd/include/am_defs.h	Fri Feb 12 06:58:47 1999
@@ -1054,7 +1054,7 @@
  * Actions to take if <ufs/ufs_mount.h> exists.
  */
 #ifdef HAVE_UFS_UFS_MOUNT_H
-# include <ufs/ufs_mount.h>
+# include <ufs/ufs/ufsmount.h>
 #endif /* HAVE_UFS_UFS_MOUNT_H */
 
 /*
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199902120622.HAA01204>