aboutsummaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_common.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2001-09-28 04:37:08 +0000
committerPeter Wemm <peter@FreeBSD.org>2001-09-28 04:37:08 +0000
commitb9b0e1920692a0f105f207da98e164630acc4104 (patch)
tree70885e3ccbc8ca40ca489f691745bc22fb96720d /sys/nfs/nfs_common.c
parentac25bcab7233cb399cb2c6889459a60ea382760b (diff)
downloadsrc-b9b0e1920692a0f105f207da98e164630acc4104.tar.gz
src-b9b0e1920692a0f105f207da98e164630acc4104.zip
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).
Notes
Notes: svn path=/head/; revision=84079
Diffstat (limited to 'sys/nfs/nfs_common.c')
-rw-r--r--sys/nfs/nfs_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index b4123f9cc2b9..029096ab8d73 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -209,7 +209,7 @@ nfsm_disct(struct mbuf **mdp, caddr_t *dposp, int siz, int left)
xfer = (siz2 > mp2->m_len) ? mp2->m_len : siz2;
if (xfer > 0) {
bcopy(mtod(mp2, caddr_t), ptr, xfer);
- NFSMADV(mp2, xfer);
+ mp2->m_data += xfer;
mp2->m_len -= xfer;
ptr += xfer;
siz2 -= xfer;