Changes for NFSv3 merge: change NFS mount arguments and add B_NEEDCOMMIT
This commit is contained in:
parent
5ac7df1caf
commit
8514e928bd
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: buf.h,v 1.23 1996/02/09 18:24:59 christos Exp $ */
|
||||
/* $NetBSD: buf.h,v 1.24 1996/02/18 11:55:45 fvdl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1989, 1993
|
||||
|
@ -95,7 +95,7 @@ struct buf {
|
|||
* These flags are kept in b_flags.
|
||||
*/
|
||||
#define B_AGE 0x00000001 /* Move to age queue when I/O done. */
|
||||
#define B_APPENDWRITE 0x00000002 /* Append-write in progress. */
|
||||
#define B_NEEDCOMMIT 0x00000002 /* Needs committing to stable storage */
|
||||
#define B_ASYNC 0x00000004 /* Start I/O, do not wait. */
|
||||
#define B_BAD 0x00000008 /* Bad block revectoring in progress. */
|
||||
#define B_BUSY 0x00000010 /* I/O in progress. */
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
/* $NetBSD: mount.h,v 1.47 1996/02/09 18:25:16 christos Exp $ */
|
||||
|
||||
/* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1991, 1993
|
||||
|
@ -300,27 +301,22 @@ struct iso_args {
|
|||
#define ISOFSMNT_GENS 0x00000002 /* enable generation numbers */
|
||||
#define ISOFSMNT_EXTATT 0x00000004 /* enable extended attributes */
|
||||
|
||||
/*
|
||||
* File Handle (32 bytes for version 2), variable up to 1024 for version 3
|
||||
*/
|
||||
union nfsv2fh {
|
||||
fhandle_t fh_generic;
|
||||
u_char fh_bytes[32];
|
||||
};
|
||||
typedef union nfsv2fh nfsv2fh_t;
|
||||
|
||||
/*
|
||||
* Arguments to mount NFS
|
||||
*/
|
||||
#define NFS_ARGSVERSION 3 /* change when nfs_args changes */
|
||||
struct nfs_args {
|
||||
int version; /* args structure version number */
|
||||
struct sockaddr *addr; /* file server address */
|
||||
int addrlen; /* length of address */
|
||||
int sotype; /* Socket type */
|
||||
int proto; /* and Protocol */
|
||||
nfsv2fh_t *fh; /* File handle to be mounted */
|
||||
u_char *fh; /* File handle to be mounted */
|
||||
int fhsize; /* Size, in bytes, of fh */
|
||||
int flags; /* flags */
|
||||
int wsize; /* write size in bytes */
|
||||
int rsize; /* read size in bytes */
|
||||
int readdirsize; /* readdir size in bytes */
|
||||
int timeo; /* initial timeout in .1 secs */
|
||||
int retrans; /* times to retry send */
|
||||
int maxgrouplist; /* Max. size of group list */
|
||||
|
@ -342,16 +338,19 @@ struct nfs_args {
|
|||
#define NFSMNT_INT 0x00000040 /* allow interrupts on hard mount */
|
||||
#define NFSMNT_NOCONN 0x00000080 /* Don't Connect the socket */
|
||||
#define NFSMNT_NQNFS 0x00000100 /* Use Nqnfs protocol */
|
||||
#define NFSMNT_MYWRITE 0x00000200 /* Assume writes were mine */
|
||||
#define NFSMNT_NFSV3 0x00000200 /* Use NFS Version 3 protocol */
|
||||
#define NFSMNT_KERB 0x00000400 /* Use Kerberos authentication */
|
||||
#define NFSMNT_DUMBTIMR 0x00000800 /* Don't estimate rtt dynamically */
|
||||
#define NFSMNT_RDIRALOOK 0x00001000 /* Do lookup with readdir (nqnfs) */
|
||||
#define NFSMNT_LEASETERM 0x00002000 /* set lease term (nqnfs) */
|
||||
#define NFSMNT_READAHEAD 0x00004000 /* set read ahead */
|
||||
#define NFSMNT_DEADTHRESH 0x00008000 /* set dead server retry thresh */
|
||||
#define NFSMNT_NQLOOKLEASE 0x00010000 /* Get lease for lookup */
|
||||
#define NFSMNT_RESVPORT 0x00020000 /* Allocate a reserved port */
|
||||
#define NFSMNT_INTERNAL 0xffe00000 /* Bits set internally */
|
||||
#define NFSMNT_LEASETERM 0x00001000 /* set lease term (nqnfs) */
|
||||
#define NFSMNT_READAHEAD 0x00002000 /* set read ahead */
|
||||
#define NFSMNT_DEADTHRESH 0x00004000 /* set dead server retry thresh */
|
||||
#define NFSMNT_RESVPORT 0x00008000 /* Allocate a reserved port */
|
||||
#define NFSMNT_RDIRPLUS 0x00010000 /* Use Readdirplus for V3 */
|
||||
#define NFSMNT_READDIRSIZE 0x00020000 /* Set readdir size */
|
||||
#define NFSMNT_INTERNAL 0xfffc0000 /* Bits set internally */
|
||||
#define NFSMNT_HASWRITEVERF 0x00040000 /* Has write verifier for V3 */
|
||||
#define NFSMNT_GOTPATHCONF 0x00080000 /* Got the V3 pathconf info */
|
||||
#define NFSMNT_GOTFSINFO 0x00100000 /* Got the V3 fsinfo */
|
||||
#define NFSMNT_MNTD 0x00200000 /* Mnt server for mnt point */
|
||||
#define NFSMNT_DISMINPROG 0x00400000 /* Dismount in progress */
|
||||
#define NFSMNT_DISMNT 0x00800000 /* Dismounted */
|
||||
|
@ -372,9 +371,10 @@ struct msdosfs_args {
|
|||
struct export_args export; /* network export information */
|
||||
uid_t uid; /* uid that owns msdosfs files */
|
||||
gid_t gid; /* gid that owns msdosfs files */
|
||||
mode_t mask; /* mask to be applied for msdosfs perms */
|
||||
mode_t mask; /* mask to be applied for msdosfs perms */
|
||||
int flags; /* see below */
|
||||
};
|
||||
|
||||
/*
|
||||
* Msdosfs mount options:
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue