diff options
| author | peter <peter@FreeBSD.org> | 2001-09-28 04:37:08 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-09-28 04:37:08 +0000 |
| commit | 562ebdfbed6da83efa5110cabff6bbb6c685cfea (patch) | |
| tree | 70885e3ccbc8ca40ca489f691745bc22fb96720d /sys/nfsserver/nfs_serv.c | |
| parent | d1e3264e13fc0aa3ac602b4919d9a89d613bc315 (diff) | |
| download | FreeBSD-src-562ebdfbed6da83efa5110cabff6bbb6c685cfea.zip FreeBSD-src-562ebdfbed6da83efa5110cabff6bbb6c685cfea.tar.gz | |
Unwind some more macros. NFSMADV() was kinda silly since it was right
next to equivalent m_len adjustments. Move the nfsm_subs.h macros
into groups depending on which phase they are used in, since that
affects the error recovery requirements. Collect some of the common error
checking into a single macro as preparation for unwinding some more.
Have nfs_rephead return a value instead of secretly modifying args.
Remove some unused function arguments that were being passed around.
Clarify nfsm_reply()'s error handling (I hope).
Diffstat (limited to 'sys/nfsserver/nfs_serv.c')
| -rw-r--r-- | sys/nfsserver/nfs_serv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index f28d638..f3e0c9a 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -1055,7 +1055,7 @@ nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, adjust = dpos - mtod(mp, caddr_t); mp->m_len -= adjust; if (mp->m_len > 0 && adjust > 0) - NFSMADV(mp, adjust); + mp->m_data += adjust; } if (zeroing) mp->m_len = 0; @@ -1273,7 +1273,7 @@ nfsrv_writegather(struct nfsrv_descript **ndp, struct nfssvc_sock *slp, adjust = dpos - mtod(mp, caddr_t); mp->m_len -= adjust; if (mp->m_len > 0 && adjust > 0) - NFSMADV(mp, adjust); + mp->m_data += adjust; } if (zeroing) mp->m_len = 0; |
