Deleted Added
full compact
nfs_node.c (143693) nfs_node.c (144367)
1/*-
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Rick Macklem at The University of Guelph.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 19 unchanged lines hidden (view full) ---

28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
33 */
34
35#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * Rick Macklem at The University of Guelph.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 19 unchanged lines hidden (view full) ---

28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * @(#)nfs_node.c 8.6 (Berkeley) 5/22/95
33 */
34
35#include <sys/cdefs.h>
36__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_node.c 143693 2005-03-16 11:28:19Z phk $");
36__FBSDID("$FreeBSD: head/sys/nfsclient/nfs_node.c 144367 2005-03-31 04:37:09Z jeff $");
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/fnv_hash.h>
41#include <sys/lock.h>
42#include <sys/malloc.h>
43#include <sys/mount.h>
44#include <sys/namei.h>

--- 123 unchanged lines hidden (view full) ---

168 return (0);
169 }
170 if (fhsize > NFS_SMALLFH) {
171 MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK);
172 } else
173 np->n_fhp = &np->n_fh;
174 bcopy((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize);
175 np->n_fhsize = fhsize;
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/fnv_hash.h>
41#include <sys/lock.h>
42#include <sys/malloc.h>
43#include <sys/mount.h>
44#include <sys/namei.h>

--- 123 unchanged lines hidden (view full) ---

168 return (0);
169 }
170 if (fhsize > NFS_SMALLFH) {
171 MALLOC(np->n_fhp, nfsfh_t *, fhsize, M_NFSBIGFH, M_WAITOK);
172 } else
173 np->n_fhp = &np->n_fh;
174 bcopy((caddr_t)fhp, (caddr_t)np->n_fhp, fhsize);
175 np->n_fhsize = fhsize;
176 lockinit(&np->n_rslock, PVFS | rsflags, "nfrslk", 0, LK_NOPAUSE);
176 lockinit(&np->n_rslock, PVFS | rsflags, "nfrslk", 0, 0);
177 *npp = np;
178
179 return (0);
180}
181
182int
183nfs_inactive(struct vop_inactive_args *ap)
184{

--- 64 unchanged lines hidden ---
177 *npp = np;
178
179 return (0);
180}
181
182int
183nfs_inactive(struct vop_inactive_args *ap)
184{

--- 64 unchanged lines hidden ---