2c2
< * Copyright (c) 1997-2001 Erez Zadok
---
> * Copyright (c) 1997-2003 Erez Zadok
41,42c41,42
< * $Id: mount_fs.c,v 1.11.2.5 2001/04/14 21:08:25 ezk Exp $
< * $FreeBSD: head/contrib/amd/libamu/mount_fs.c 82809 2001-09-02 19:14:18Z obrien $
---
> * $Id: mount_fs.c,v 1.11.2.11 2003/05/08 17:57:53 ib42 Exp $
> * $FreeBSD: head/contrib/amd/libamu/mount_fs.c 119682 2003-09-02 15:42:57Z mbr $
109,111c109,112
< #if defined(MNT2_NFS_OPT_PROPLIST) && defined(MNTTAB_OPT_PROPLIST)
< {MNTTAB_OPT_PROPLIST, MNT2_NFS_OPT_PROPLIST},
< #endif /* defined(MNT2_NFS_OPT_PROPLIST) && defined(MNTTAB_OPT_PROPLIST) */
---
> /*
> * Do not define MNT2_NFS_OPT_* entries here! This is for generic
> * mount(2) options only, not for NFS mount options.
> */
113,116d113
< #if defined(MNT2_NFS_OPT_NONLM) && defined(MNTTAB_OPT_NOLOCK)
< {MNTTAB_OPT_NOLOCK, MNT2_NFS_OPT_NONLM},
< #endif /* defined(MNT2_NFS_OPT_NONLM) && defined(MNTTAB_OPT_NOLOCK) */
<
126c123
< int flags;
---
> int flags = 0;
128d124
< /* start: this must come first */
131,134c127,130
< #else /* not MNT2_GEN_OPT_NEWTYPE */
< /* Not all machines have MNT2_GEN_OPT_NEWTYPE (HP-UX 9.01) */
< flags = 0;
< #endif /* not MNT2_GEN_OPT_NEWTYPE */
---
> #endif /* MNT2_GEN_OPT_NEWTYPE */
> #ifdef MNT2_GEN_OPT_AUTOMOUNTED
> flags |= MNT2_GEN_OPT_AUTOMOUNTED;
> #endif /* not MNT2_GEN_OPT_AUTOMOUNTED */
136d131
< #if defined(MNT2_GEN_OPT_OVERLAY) && defined(MNTTAB_OPT_OVERLAY)
138,148d132
< * Overlay this amd mount (presumably on another amd which died
< * before and left the machine hung). This will allow a new amd or
< * hlfsd to be remounted on top of another one.
< */
< if (hasmntopt(mntp, MNTTAB_OPT_OVERLAY)) {
< flags |= MNT2_GEN_OPT_OVERLAY;
< plog(XLOG_INFO, "using an overlay mount");
< }
< #endif /* defined(MNT2_GEN_OVERLAY) && defined(MNTOPT_OVERLAY) */
<
< /*
304c288
< # ifdef HAVE_FIELD_MNTENT_T_MNT_CNODE
---
> # ifdef HAVE_MNTENT_T_MNT_CNODE
306c290
< # endif /* HAVE_FIELD_MNTENT_T_MNT_CNODE */
---
> # endif /* HAVE_MNTENT_T_MNT_CNODE */
308c292
< # ifdef HAVE_FIELD_MNTENT_T_MNT_RO
---
> # ifdef HAVE_MNTENT_T_MNT_RO
310c294
< # endif /* HAVE_FIELD_MNTENT_T_MNT_RO */
---
> # endif /* HAVE_MNTENT_T_MNT_RO */
312,313c296,297
< # ifdef HAVE_FIELD_MNTENT_T_MNT_TIME
< # ifdef HAVE_FIELD_MNTENT_T_MNT_TIME_STRING
---
> # ifdef HAVE_MNTENT_T_MNT_TIME
> # ifdef HAVE_MNTENT_T_MNT_TIME_STRING
319c303
< # else /* not HAVE_FIELD_MNTENT_T_MNT_TIME_STRING */
---
> # else /* not HAVE_MNTENT_T_MNT_TIME_STRING */
321,322c305,306
< # endif /* not HAVE_FIELD_MNTENT_T_MNT_TIME_STRING */
< # endif /* HAVE_FIELD_MNTENT_T_MNT_TIME */
---
> # endif /* not HAVE_MNTENT_T_MNT_TIME_STRING */
> # endif /* HAVE_MNTENT_T_MNT_TIME */
378c362
< # if defined(HAVE_FIELD_NFS_ARGS_T_FHSIZE) || defined(HAVE_FIELD_NFS_ARGS_T_FH_LEN)
---
> # if defined(HAVE_NFS_ARGS_T_FHSIZE) || defined(HAVE_NFS_ARGS_T_FH_LEN)
386c370
< # else /* not defined(HAVE_FIELD_NFS_ARGS_T_FHSIZE) || defined(HAVE_FIELD_NFS_ARGS_T_FH_LEN) */
---
> # else /* not defined(HAVE_NFS_ARGS_T_FHSIZE) || defined(HAVE_NFS_ARGS_T_FH_LEN) */
388c372
< # endif /* not defined(HAVE_FIELD_NFS_ARGS_T_FHSIZE) || defined(HAVE_FIELD_NFS_ARGS_T_FH_LEN) */
---
> # endif /* not defined(HAVE_NFS_ARGS_T_FHSIZE) || defined(HAVE_NFS_ARGS_T_FH_LEN) */
399c383
< #ifdef HAVE_FIELD_NFS_ARGS_T_FHSIZE
---
> #ifdef HAVE_NFS_ARGS_T_FHSIZE
406c390
< #endif /* HAVE_FIELD_NFS_ARGS_T_FHSIZE */
---
> #endif /* HAVE_NFS_ARGS_T_FHSIZE */
409c393
< #ifdef HAVE_FIELD_NFS_ARGS_T_FH_LEN
---
> #ifdef HAVE_NFS_ARGS_T_FH_LEN
416c400
< #endif /* HAVE_FIELD_NFS_ARGS_T_FH_LEN */
---
> #endif /* HAVE_NFS_ARGS_T_FH_LEN */
444c428
< #ifdef HAVE_FIELD_NFS_ARGS_T_ACREGMIN
---
> #ifdef HAVE_NFS_ARGS_T_ACREGMIN
447,448c431,432
< #endif /* HAVE_FIELD_NFS_ARGS_T_ACREGMIN */
< #ifdef HAVE_FIELD_NFS_ARGS_T_ACDIRMIN
---
> #endif /* HAVE_NFS_ARGS_T_ACREGMIN */
> #ifdef HAVE_NFS_ARGS_T_ACDIRMIN
451c435
< #endif /* HAVE_FIELD_NFS_ARGS_T_ACDIRMIN */
---
> #endif /* HAVE_NFS_ARGS_T_ACDIRMIN */
507c491
< #ifdef HAVE_FIELD_NFS_ARGS_T_SOTYPE
---
> #ifdef HAVE_NFS_ARGS_T_SOTYPE
515c499
< #endif /* HAVE_FIELD_NFS_ARGS_T_SOTYPE */
---
> #endif /* HAVE_NFS_ARGS_T_SOTYPE */
517c501
< #ifdef HAVE_FIELD_NFS_ARGS_T_PROTO
---
> #ifdef HAVE_NFS_ARGS_T_PROTO
527c511
< #endif /* HAVE_FIELD_NFS_ARGS_T_SOTYPE */
---
> #endif /* HAVE_NFS_ARGS_T_SOTYPE */
529c513
< #ifdef HAVE_FIELD_NFS_ARGS_T_VERSION
---
> #ifdef HAVE_NFS_ARGS_T_VERSION
536c520
< #endif /* HAVE_FIELD_NFS_ARGS_VERSION */
---
> #endif /* HAVE_NFS_ARGS_VERSION */
718c702,707
< #ifdef HAVE_FIELD_NFS_ARGS_T_OPTSTR
---
> #if defined(MNT2_NFS_OPT_NONLM) && defined(MNTTAB_OPT_NOLOCK)
> if (hasmntopt(mntp, MNTTAB_OPT_NOLOCK) != NULL)
> nap->flags |= MNT2_NFS_OPT_NONLM;
> #endif /* defined(MNT2_NFS_OPT_NONLM) && defined(MNTTAB_OPT_NOLOCK) */
>
> #ifdef HAVE_NFS_ARGS_T_OPTSTR
720c709
< #endif /* HAVE_FIELD_NFS_ARGS_T_OPTSTR */
---
> #endif /* HAVE_NFS_ARGS_T_OPTSTR */
726c715
< #ifdef HAVE_FIELD_NFS_ARGS_T_GFS_FLAGS
---
> #ifdef HAVE_NFS_ARGS_T_GFS_FLAGS
729c718
< #endif /* HAVE_FIELD_NFS_ARGS_T_FLAGS */
---
> #endif /* HAVE_NFS_ARGS_T_FLAGS */
867c856
< plog(XLOG_DEBUG, "NA->knconf->semantics %lu", (unsigned long) kncp->knc_semantics);
---
> plog(XLOG_DEBUG, "NA->knconf->semantics %lu", (u_long) kncp->knc_semantics);
870c859
< plog(XLOG_DEBUG, "NA->knconf->rdev %lu", kncp->knc_rdev);
---
> plog(XLOG_DEBUG, "NA->knconf->rdev %lu", (u_long) kncp->knc_rdev);
877c866
< #ifdef HAVE_FIELD_STRUCT_SOCKADDR_SA_LEN
---
> #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
879c868
< #endif /* HAVE_FIELD_STRUCT_SOCKADDR_SA_LEN */
---
> #endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
887c876
< #ifdef HAVE_FIELD_NFS_ARGS_T_NAMLEN
---
> #ifdef HAVE_NFS_ARGS_T_NAMLEN
889c878
< #endif /* HAVE_FIELD_NFS_ARGS_T_NAMLEN */
---
> #endif /* HAVE_NFS_ARGS_T_NAMLEN */
895c884
< #ifdef HAVE_FIELD_NFS_ARGS_T_FHSIZE
---
> #ifdef HAVE_NFS_ARGS_T_FHSIZE
898,899c887,888
< #endif /* HAVE_FIELD_NFS_ARGS_T_FHSIZE */
< #ifdef HAVE_FIELD_NFS_ARGS_T_FH_LEN
---
> #endif /* HAVE_NFS_ARGS_T_FHSIZE */
> #ifdef HAVE_NFS_ARGS_T_FH_LEN
902c891
< #endif /* HAVE_FIELD_NFS_ARGS_T_FH_LEN */
---
> #endif /* HAVE_NFS_ARGS_T_FH_LEN */
913c902
< #ifdef HAVE_FIELD_NFS_ARGS_T_SOTYPE
---
> #ifdef HAVE_NFS_ARGS_T_SOTYPE
915,916c904,905
< #endif /* HAVE_FIELD_NFS_ARGS_T_SOTYPE */
< #ifdef HAVE_FIELD_NFS_ARGS_T_PROTO
---
> #endif /* HAVE_NFS_ARGS_T_SOTYPE */
> #ifdef HAVE_NFS_ARGS_T_PROTO
918,919c907,908
< #endif /* HAVE_FIELD_NFS_ARGS_T_PROTO */
< #ifdef HAVE_FIELD_NFS_ARGS_T_VERSION
---
> #endif /* HAVE_NFS_ARGS_T_PROTO */
> #ifdef HAVE_NFS_ARGS_T_VERSION
921c910
< #endif /* HAVE_FIELD_NFS_ARGS_T_VERSION */
---
> #endif /* HAVE_NFS_ARGS_T_VERSION */
927c916
< #ifdef HAVE_FIELD_NFS_ARGS_T_BSIZE
---
> #ifdef HAVE_NFS_ARGS_T_BSIZE
929c918
< #endif /* HAVE_FIELD_NFS_ARGS_T_BSIZE */
---
> #endif /* HAVE_NFS_ARGS_T_BSIZE */
933c922
< #ifdef HAVE_FIELD_NFS_ARGS_T_ACREGMIN
---
> #ifdef HAVE_NFS_ARGS_T_ACREGMIN
938c927
< #endif /* HAVE_FIELD_NFS_ARGS_T_ACREGMIN */
---
> #endif /* HAVE_NFS_ARGS_T_ACREGMIN */