src - FreeBSD source tree

diff options


context:
space:
mode:

author	Rick Macklem <rmacklem@FreeBSD.org>	2022-04-08 20:59:05 +0000
committer	Rick Macklem <rmacklem@FreeBSD.org>	2022-06-09 19:57:30 +0000
commit	2e6b10dc5bd991a7438724a18a532ab73eb1ace0 (patch)
tree	6011db9ac2945e00f754c2a312c9a71d513a5046 /sys/fs/nfsclient/nfs_clrpcops.c
parent	4b26e201872c8c0647b94986e0090c46c8d1e621 (diff)
download	src-2e6b10dc5bd991a7438724a18a532ab73eb1ace0.tar.gz src-2e6b10dc5bd991a7438724a18a532ab73eb1ace0.zip

Diffstat (limited to 'sys/fs/nfsclient/nfs_clrpcops.c')

-rw-r--r--

sys/fs/nfsclient/nfs_clrpcops.c

1 files changed, 16 insertions, 17 deletions

diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c
index 149b57e49fb7..f6b6e75b4278 100644
--- a/sys/fs/nfsclient/nfs_clrpcops.c
+++ b/sys/fs/nfsclient/nfs_clrpcops.c

@@ -1376,7 +1376,7 @@ nfsrpc_setattrrpc(vnode_t vp, struct vattr *vap,

if (error)

return (error);

if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4))

- error = nfscl_wcc_data(nd, vp, rnap, attrflagp, NULL, stuff);

+ error = nfscl_wcc_data(nd, vp, rnap, attrflagp, NULL, NULL);

if ((nd->nd_flag & (ND_NFSV4 | ND_NOMOREDATA)) == ND_NFSV4 && !error)

error = nfsrv_getattrbits(nd, &attrbits, NULL, NULL);

if (!(nd->nd_flag & ND_NFSV3) && !nd->nd_repstat && !error)

@@ -1895,7 +1895,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode,

}

if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) {

error = nfscl_wcc_data(nd, vp, nap, attrflagp,

- &wccflag, stuff);

+ &wccflag, NULL);

if (error)

goto nfsmout;

}

@@ -2026,7 +2026,7 @@ nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap,

if (error)

return (error);

if (nd->nd_flag & ND_NFSV4)

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

if (!nd->nd_repstat) {

if (nd->nd_flag & ND_NFSV4) {

NFSM_DISSECT(tl, u_int32_t *, 5 * NFSX_UNSIGNED);

@@ -2039,7 +2039,7 @@ nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap,

goto nfsmout;

}

if (nd->nd_flag & ND_NFSV3)

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

if (!error && nd->nd_repstat)

error = nd->nd_repstat;

nfsmout:

@@ -2163,7 +2163,7 @@ nfsrpc_createv23(vnode_t dvp, char *name, int namelen, struct vattr *vap,

goto nfsmout;

}

if (nd->nd_flag & ND_NFSV3)

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

if (nd->nd_repstat != 0 && error == 0)

error = nd->nd_repstat;

nfsmout:

@@ -2486,7 +2486,7 @@ tryagain:

nd->nd_flag |= ND_NOMOREDATA;

}

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

}

if (nd->nd_repstat && !error)

error = nd->nd_repstat;

@@ -2633,8 +2633,7 @@ tryagain:

if (*(tl + 1))

nd->nd_flag |= ND_NOMOREDATA;

}

- error = nfscl_wcc_data(nd, fdvp, fnap, fattrflagp, NULL,

- fstuff);

+ error = nfscl_wcc_data(nd, fdvp, fnap, fattrflagp, NULL, NULL);

/* and the second wcc attribute reply. */

if ((nd->nd_flag & (ND_NFSV4 | ND_NOMOREDATA)) == ND_NFSV4 &&

!error) {

@@ -2644,7 +2643,7 @@ tryagain:

}

if (!error)

error = nfscl_wcc_data(nd, tdvp, tnap, tattrflagp,

- NULL, tstuff);

+ NULL, NULL);

}

if (nd->nd_repstat && !error)

error = nd->nd_repstat;

@@ -2694,7 +2693,7 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen,

error = nfscl_postop_attr(nd, nap, attrflagp, dstuff);

if (!error)

error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp,

- NULL, dstuff);

+ NULL, NULL);

} else if ((nd->nd_flag & (ND_NFSV4 | ND_NOMOREDATA)) == ND_NFSV4) {

* First, parse out the PutFH and Getattr result.

@@ -2707,7 +2706,7 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen,

* Get the pre-op attributes.

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

}

if (nd->nd_repstat && !error)

error = nd->nd_repstat;

@@ -2754,13 +2753,13 @@ nfsrpc_symlink(vnode_t dvp, char *name, int namelen, const char *target,

if (error)

return (error);

if (nd->nd_flag & ND_NFSV4)

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

if ((nd->nd_flag & ND_NFSV3) && !error) {

if (!nd->nd_repstat)

error = nfscl_mtofh(nd, nfhpp, nnap, attrflagp);

if (!error)

error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp,

- NULL, dstuff);

+ NULL, NULL);

}

if (nd->nd_repstat && !error)

error = nd->nd_repstat;

@@ -2824,7 +2823,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap,

if (error)

return (error);

if (nd->nd_flag & ND_NFSV4)

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

if (!nd->nd_repstat && !error) {

if (nd->nd_flag & ND_NFSV4) {

NFSM_DISSECT(tl, u_int32_t *, 5 * NFSX_UNSIGNED);

@@ -2842,7 +2841,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap,

}

if ((nd->nd_flag & ND_NFSV3) && !error)

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

if (nd->nd_repstat && !error)

error = nd->nd_repstat;

nfsmout:

@@ -2878,7 +2877,7 @@ nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, struct ucred *cred,

if (error)

return (error);

if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4))

- error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff);

+ error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL);

if (nd->nd_repstat && !error)

error = nd->nd_repstat;

m_freem(nd->nd_mrep);

@@ -3928,7 +3927,7 @@ nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, struct ucred *cred,

error = nfscl_request(nd, vp, p, cred, stuff);

if (error)

return (error);

- error = nfscl_wcc_data(nd, vp, nap, attrflagp, NULL, stuff);

+ error = nfscl_wcc_data(nd, vp, nap, attrflagp, NULL, NULL);

if (!error && !nd->nd_repstat) {

NFSM_DISSECT(tl, u_int32_t *, NFSX_VERF);

NFSLOCKMNT(nmp);