diff options
author | bde <bde@FreeBSD.org> | 1998-02-01 21:23:29 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-02-01 21:23:29 +0000 |
commit | a1f8745634886199dde3f3fab1edef92c32f3d99 (patch) | |
tree | d977aceceec8e8853d1562e57c911d79f7dad3b0 /sys/nfsclient/nfs.h | |
parent | 446b81e75dc2e9074c68c215520f545863d0e0a1 (diff) | |
download | FreeBSD-src-a1f8745634886199dde3f3fab1edef92c32f3d99.zip FreeBSD-src-a1f8745634886199dde3f3fab1edef92c32f3d99.tar.gz |
Moved declaration of `union nethostadr' outside of the KERNEL section,
to give pollution compatible with <nfs/nqfs.h>. At least mount_nfs.c
previously had to #define KERNEL before including <nfs/nfs.h> to get
this pollution, but this gave other pollution.
Moved comment about NFSINT_SIGMASK to immediately before the code that
it applies to.
Diffstat (limited to 'sys/nfsclient/nfs.h')
-rw-r--r-- | sys/nfsclient/nfs.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h index cd1db27..9f057a3 100644 --- a/sys/nfsclient/nfs.h +++ b/sys/nfsclient/nfs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $Id: nfs.h,v 1.31 1997/09/10 19:52:24 phk Exp $ + * $Id: nfs.h,v 1.32 1997/10/12 20:25:38 phk Exp $ */ #ifndef _NFS_NFS_H_ @@ -291,13 +291,13 @@ struct nfsstats { } /* - * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts. - * What should be in this set is open to debate, but I believe that since - * I/O system calls on ufs are never interrupted by signals the set should - * be minimal. My reasoning is that many current programs that use signals - * such as SIGALRM will not expect file I/O system calls to be interrupted - * by them and break. + * Network address hash list element */ +union nethostaddr { + u_long had_inetaddr; + struct sockaddr *had_nam; +}; + #ifdef KERNEL #ifdef MALLOC_DECLARE @@ -313,6 +313,14 @@ MALLOC_DECLARE(M_NFSBIGFH); struct uio; struct buf; struct vattr; struct nameidata; /* XXX */ +/* + * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts. + * What should be in this set is open to debate, but I believe that since + * I/O system calls on ufs are never interrupted by signals the set should + * be minimal. My reasoning is that many current programs that use signals + * such as SIGALRM will not expect file I/O system calls to be interrupted + * by them and break. + */ #define NFSINT_SIGMASK (sigmask(SIGINT)|sigmask(SIGTERM)|sigmask(SIGKILL)| \ sigmask(SIGHUP)|sigmask(SIGQUIT)) @@ -384,14 +392,6 @@ extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq; #define NFSNOHASH(fhsum) \ (&nfsnodehashtbl[(fhsum) & nfsnodehash]) -/* - * Network address hash list element - */ -union nethostaddr { - u_long had_inetaddr; - struct sockaddr *had_nam; -}; - struct nfsuid { TAILQ_ENTRY(nfsuid) nu_lru; /* LRU chain */ LIST_ENTRY(nfsuid) nu_hash; /* Hash list */ |