diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2001-10-11 23:38:17 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2001-10-11 23:38:17 +0000 |
| commit | bd78cece5df2063d2e852bd6c895e05385eea931 (patch) | |
| tree | d3ca87a8ac917d5003235cc737cd5f76591f7c1b /sys/nfsclient | |
| parent | 698166ca554d6cba78cd1728268fa03091697973 (diff) | |
Notes
Diffstat (limited to 'sys/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs_bio.c | 18 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 3 |
2 files changed, 7 insertions, 14 deletions
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index bddec5d845b5..fae952d88da6 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -884,10 +884,8 @@ again: error = EINTR; break; } - if (bp->b_wcred == NOCRED) { - crhold(cred); - bp->b_wcred = cred; - } + if (bp->b_wcred == NOCRED) + bp->b_wcred = crhold(cred); np->n_flag |= NMODIFIED; /* @@ -1207,16 +1205,12 @@ again: } if (bp->b_iocmd == BIO_READ) { - if (bp->b_rcred == NOCRED && cred != NOCRED) { - crhold(cred); - bp->b_rcred = cred; - } + if (bp->b_rcred == NOCRED && cred != NOCRED) + bp->b_rcred = crhold(cred); } else { bp->b_flags |= B_WRITEINPROG; - if (bp->b_wcred == NOCRED && cred != NOCRED) { - crhold(cred); - bp->b_wcred = cred; - } + if (bp->b_wcred == NOCRED && cred != NOCRED) + bp->b_wcred = crhold(cred); } BUF_KERNPROC(bp); diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index ed571434a4a9..fdb0fca80390 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -2361,8 +2361,7 @@ nfs_sillyrename(struct vnode *dvp, struct vnode *vp, struct componentname *cnp) #endif MALLOC(sp, struct sillyrename *, sizeof (struct sillyrename), M_NFSREQ, M_WAITOK); - crhold(cnp->cn_cred); - sp->s_cred = cnp->cn_cred; + sp->s_cred = crhold(cnp->cn_cred); sp->s_dvp = dvp; VREF(dvp); |