Deleted Added
full compact
nfs_vnops.c (1.233) nfs_vnops.c (1.234)
1/* $NetBSD: nfs_vnops.c,v 1.233 2006/04/15 00:36:23 christos Exp $ */
1/* $NetBSD: nfs_vnops.c,v 1.234 2006/04/15 00:40:20 christos Exp $ */
2
3/*
4 * Copyright (c) 1989, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * Rick Macklem at The University of Guelph.
9 *

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

34 * @(#)nfs_vnops.c 8.19 (Berkeley) 7/31/95
35 */
36
37/*
38 * vnode op calls for Sun NFS version 2 and 3
39 */
40
41#include <sys/cdefs.h>
2
3/*
4 * Copyright (c) 1989, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * This code is derived from software contributed to Berkeley by
8 * Rick Macklem at The University of Guelph.
9 *

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

34 * @(#)nfs_vnops.c 8.19 (Berkeley) 7/31/95
35 */
36
37/*
38 * vnode op calls for Sun NFS version 2 and 3
39 */
40
41#include <sys/cdefs.h>
42__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.233 2006/04/15 00:36:23 christos Exp $");
42__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.234 2006/04/15 00:40:20 christos Exp $");
43
44#include "opt_inet.h"
45#include "opt_nfs.h"
46#include "opt_uvmhist.h"
47
48#include <sys/param.h>
49#include <sys/proc.h>
50#include <sys/kernel.h>

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

1924 int32_t t1;
1925 caddr_t cp2;
1926#endif
1927 int32_t t2;
1928 caddr_t bpos, dpos;
1929 int error = 0, wccflag = NFSV3_WCCRATTR;
1930 struct mbuf *mreq, *mrep, *md, *mb;
1931 const int v3 = NFS_ISV3(dvp);
43
44#include "opt_inet.h"
45#include "opt_nfs.h"
46#include "opt_uvmhist.h"
47
48#include <sys/param.h>
49#include <sys/proc.h>
50#include <sys/kernel.h>

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

1924 int32_t t1;
1925 caddr_t cp2;
1926#endif
1927 int32_t t2;
1928 caddr_t bpos, dpos;
1929 int error = 0, wccflag = NFSV3_WCCRATTR;
1930 struct mbuf *mreq, *mrep, *md, *mb;
1931 const int v3 = NFS_ISV3(dvp);
1932 int rexmit;
1932 int rexmit = 0;
1933 struct nfsnode *dnp = VTONFS(dvp);
1934
1935 nfsstats.rpccnt[NFSPROC_REMOVE]++;
1936 nfsm_reqhead(dnp, NFSPROC_REMOVE,
1937 NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(namelen));
1938 nfsm_fhtom(dnp, v3);
1939 nfsm_strtom(name, namelen, NFS_MAXNAMLEN);
1940 nfsm_request1(dnp, NFSPROC_REMOVE, l, cred, &rexmit);

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

2064 int32_t t1;
2065 caddr_t cp2;
2066#endif
2067 int32_t t2;
2068 caddr_t bpos, dpos;
2069 int error = 0, fwccflag = NFSV3_WCCRATTR, twccflag = NFSV3_WCCRATTR;
2070 struct mbuf *mreq, *mrep, *md, *mb;
2071 const int v3 = NFS_ISV3(fdvp);
1933 struct nfsnode *dnp = VTONFS(dvp);
1934
1935 nfsstats.rpccnt[NFSPROC_REMOVE]++;
1936 nfsm_reqhead(dnp, NFSPROC_REMOVE,
1937 NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(namelen));
1938 nfsm_fhtom(dnp, v3);
1939 nfsm_strtom(name, namelen, NFS_MAXNAMLEN);
1940 nfsm_request1(dnp, NFSPROC_REMOVE, l, cred, &rexmit);

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

2064 int32_t t1;
2065 caddr_t cp2;
2066#endif
2067 int32_t t2;
2068 caddr_t bpos, dpos;
2069 int error = 0, fwccflag = NFSV3_WCCRATTR, twccflag = NFSV3_WCCRATTR;
2070 struct mbuf *mreq, *mrep, *md, *mb;
2071 const int v3 = NFS_ISV3(fdvp);
2072 int rexmit;
2072 int rexmit = 0;
2073 struct nfsnode *fdnp = VTONFS(fdvp);
2074
2075 nfsstats.rpccnt[NFSPROC_RENAME]++;
2076 nfsm_reqhead(fdnp, NFSPROC_RENAME,
2077 (NFSX_FH(v3) + NFSX_UNSIGNED)*2 + nfsm_rndup(fnamelen) +
2078 nfsm_rndup(tnamelen));
2079 nfsm_fhtom(fdnp, v3);
2080 nfsm_strtom(fnameptr, fnamelen, NFS_MAXNAMLEN);

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

2124 caddr_t cp2;
2125#endif
2126 int32_t t2;
2127 caddr_t bpos, dpos;
2128 int error = 0, wccflag = NFSV3_WCCRATTR, attrflag = 0;
2129 struct mbuf *mreq, *mrep, *md, *mb;
2130 /* XXX Should be const and initialised? */
2131 int v3;
2073 struct nfsnode *fdnp = VTONFS(fdvp);
2074
2075 nfsstats.rpccnt[NFSPROC_RENAME]++;
2076 nfsm_reqhead(fdnp, NFSPROC_RENAME,
2077 (NFSX_FH(v3) + NFSX_UNSIGNED)*2 + nfsm_rndup(fnamelen) +
2078 nfsm_rndup(tnamelen));
2079 nfsm_fhtom(fdnp, v3);
2080 nfsm_strtom(fnameptr, fnamelen, NFS_MAXNAMLEN);

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

2124 caddr_t cp2;
2125#endif
2126 int32_t t2;
2127 caddr_t bpos, dpos;
2128 int error = 0, wccflag = NFSV3_WCCRATTR, attrflag = 0;
2129 struct mbuf *mreq, *mrep, *md, *mb;
2130 /* XXX Should be const and initialised? */
2131 int v3;
2132 int rexmit;
2132 int rexmit = 0;
2133 struct nfsnode *np;
2134
2135 if (dvp->v_mount != vp->v_mount) {
2136 VOP_ABORTOP(dvp, cnp);
2137 vput(dvp);
2138 return (EXDEV);
2139 }
2140 if (dvp != vp) {

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

2303 caddr_t cp;
2304 int32_t t1, t2;
2305 int len;
2306 struct nfsnode *dnp = VTONFS(dvp), *np = (struct nfsnode *)0;
2307 struct vnode *newvp = (struct vnode *)0;
2308 caddr_t bpos, dpos, cp2;
2309 int error = 0, wccflag = NFSV3_WCCRATTR;
2310 int gotvp = 0;
2133 struct nfsnode *np;
2134
2135 if (dvp->v_mount != vp->v_mount) {
2136 VOP_ABORTOP(dvp, cnp);
2137 vput(dvp);
2138 return (EXDEV);
2139 }
2140 if (dvp != vp) {

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

2303 caddr_t cp;
2304 int32_t t1, t2;
2305 int len;
2306 struct nfsnode *dnp = VTONFS(dvp), *np = (struct nfsnode *)0;
2307 struct vnode *newvp = (struct vnode *)0;
2308 caddr_t bpos, dpos, cp2;
2309 int error = 0, wccflag = NFSV3_WCCRATTR;
2310 int gotvp = 0;
2311 int rexmit;
2311 int rexmit = 0;
2312 struct mbuf *mreq, *mrep, *md, *mb;
2313 const int v3 = NFS_ISV3(dvp);
2314
2315 len = cnp->cn_namelen;
2316 nfsstats.rpccnt[NFSPROC_MKDIR]++;
2317 nfsm_reqhead(dnp, NFSPROC_MKDIR,
2318 NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(len) + NFSX_SATTR(v3));
2319 nfsm_fhtom(dnp, v3);

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

2395 caddr_t cp;
2396#ifndef NFS_V2_ONLY
2397 int32_t t1;
2398 caddr_t cp2;
2399#endif
2400 int32_t t2;
2401 caddr_t bpos, dpos;
2402 int error = 0, wccflag = NFSV3_WCCRATTR;
2312 struct mbuf *mreq, *mrep, *md, *mb;
2313 const int v3 = NFS_ISV3(dvp);
2314
2315 len = cnp->cn_namelen;
2316 nfsstats.rpccnt[NFSPROC_MKDIR]++;
2317 nfsm_reqhead(dnp, NFSPROC_MKDIR,
2318 NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(len) + NFSX_SATTR(v3));
2319 nfsm_fhtom(dnp, v3);

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

2395 caddr_t cp;
2396#ifndef NFS_V2_ONLY
2397 int32_t t1;
2398 caddr_t cp2;
2399#endif
2400 int32_t t2;
2401 caddr_t bpos, dpos;
2402 int error = 0, wccflag = NFSV3_WCCRATTR;
2403 int rexmit;
2403 int rexmit = 0;
2404 struct mbuf *mreq, *mrep, *md, *mb;
2405 const int v3 = NFS_ISV3(dvp);
2406 struct nfsnode *dnp;
2407
2408 if (dvp == vp) {
2409 vrele(dvp);
2410 vput(dvp);
2411 PNBUF_PUT(cnp->cn_pnbuf);

--- 1274 unchanged lines hidden ---
2404 struct mbuf *mreq, *mrep, *md, *mb;
2405 const int v3 = NFS_ISV3(dvp);
2406 struct nfsnode *dnp;
2407
2408 if (dvp == vp) {
2409 vrele(dvp);
2410 vput(dvp);
2411 PNBUF_PUT(cnp->cn_pnbuf);

--- 1274 unchanged lines hidden ---