diff options
| author |   art <art@openbsd.org> | 2002-02-23 23:47:13 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2002-02-23 23:47:13 +0000 |
| commit | 95d419fc071ccd14200a0a24554dfc021b4303db (patch) | |
| tree | 19bad6947cd38df916e12987879ede83c0a6bd9b /sys/nfs/nfsnode.h | |
| parent | SRC prefix is not required for some operations. (diff) | |
| download | wireguard-openbsd-95d419fc071ccd14200a0a24554dfc021b4303db.tar.xz wireguard-openbsd-95d419fc071ccd14200a0a24554dfc021b4303db.zip | |
Sigh. The diff is out for testing for three months without a single problem.
Two days after commit people report serious lockups all over the place.
Back out nfs locking changes.
Diffstat (limited to 'sys/nfs/nfsnode.h')
| -rw-r--r-- | sys/nfs/nfsnode.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h index e1a8e41e57d..b46032bad85 100644 --- a/sys/nfs/nfsnode.h +++ b/sys/nfs/nfsnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsnode.h,v 1.14 2002/02/22 20:19:14 csapuntz Exp $ */ +/* $OpenBSD: nfsnode.h,v 1.15 2002/02/23 23:47:13 art Exp $ */ /* $NetBSD: nfsnode.h,v 1.16 1996/02/18 11:54:04 fvdl Exp $ */ /* @@ -119,7 +119,6 @@ struct nfsnode { nfsfh_t n_fh; /* Small File Handle */ struct ucred *n_rcred; struct ucred *n_wcred; - struct lock n_lock; }; #define n_atim n_un1.nf_atim @@ -188,9 +187,9 @@ int nfs_readdir __P((void *)); int nfs_readlink __P((void *)); int nfs_inactive __P((void *)); int nfs_reclaim __P((void *)); -int nfs_lock __P((void *)); -int nfs_unlock __P((void *)); -int nfs_islocked __P((void *)); +#define nfs_lock ((int (*) __P((void *)))vop_generic_lock) +#define nfs_unlock ((int (*) __P((void *)))vop_generic_unlock) +#define nfs_islocked ((int (*) __P((void *)))vop_generic_islocked) int nfs_bmap __P((void *)); int nfs_strategy __P((void *)); int nfs_print __P((void *)); |