system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-16 06:52:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfsclient: warnings cleanups

Browse source
This commit is contained in:
Matt Macy 2018-05-20 06:14:12 +00:00
parent 98131b3eb2
commit b7faa59dee
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=333924
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/fs/nfsclient/nfs_clcomsubs.c
View file

@ -354,7 +354,7 @@ nfsm_uiombuflist(struct uio *uiop, int siz, struct mbuf **mbp, char **cpp)
char *uiocp;
struct mbuf *mp, *mp2, *firstmp;
int xfer, left, mlen;
int uiosiz, clflg, rem;
int uiosiz, clflg;
char *tcp;
KASSERT(uiop->uio_iovcnt == 1, ("nfsm_uiotombuf: iovcnt != 1"));
@ -363,7 +363,6 @@ nfsm_uiombuflist(struct uio *uiop, int siz, struct mbuf **mbp, char **cpp)
clflg = 1;
else
clflg = 0;
rem = NFSM_RNDUP(siz) - siz;
if (clflg != 0)
NFSMCLGET(mp, M_WAITOK);
else

6
sys/fs/nfsclient/nfs_clrpcops.c
View file

@ -2845,7 +2845,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
KASSERT(uiop->uio_iovcnt == 1 &&
(uio_uio_resid(uiop) & (DIRBLKSIZ - 1)) == 0,
("nfs readdirrpc bad uio"));
ncookie.lval[0] = ncookie.lval[1] = 0;
/*
* There is no point in reading a lot more than uio_resid, however
* adding one additional DIRBLKSIZ makes sense. Since uio_resid
@ -3288,6 +3288,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
KASSERT(uiop->uio_iovcnt == 1 &&
(uio_uio_resid(uiop) & (DIRBLKSIZ - 1)) == 0,
("nfs readdirplusrpc bad uio"));
ncookie.lval[0] = ncookie.lval[1] = 0;
timespecclear(&dctime);
*attrflagp = 0;
if (eofp != NULL)
@ -6943,6 +6944,7 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, uid_t *uidp, gid_t *gidp,
NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
len = fxdr_unsigned(uint32_t, *tl);
str = NULL;
if (len > NFSV4_OPAQUELIMIT) {
error = NFSERR_BADXDR;
goto nfsmout;
@ -7244,7 +7246,6 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap,
struct nfsclsession *tsep;
nfsattrbit_t attrbits;
nfsv4stateid_t stateid;
uint32_t rflags;
struct nfsmount *nmp;
nmp = VFSTONFS(dvp->v_mount);
@ -7327,7 +7328,6 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap,
stateid.other[0] = *tl++;
stateid.other[1] = *tl++;
stateid.other[2] = *tl;
rflags = fxdr_unsigned(u_int32_t, *(tl + 6));
nfsrv_getattrbits(nd, &attrbits, NULL, NULL);
NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
deleg = fxdr_unsigned(int, *tl);