Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfs_zeropad: remove an unneeded substitution (and clean up a little.)

Browse Source
This commit is contained in:
yamt 2003-11-29 19:31:13 +00:00
parent 4e8d9fe867
commit 32e454901e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/nfs/nfs_subs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_subs.c,v 1.129 2003/10/02 06:01:51 itojun Exp $ */
/* $NetBSD: nfs_subs.c,v 1.130 2003/11/29 19:31:13 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.129 2003/10/02 06:01:51 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.130 2003/11/29 19:31:13 yamt Exp $");
#include "fs_nfs.h"
#include "opt_nfs.h"
@ -2134,8 +2134,7 @@ nfs_zeropad(mp, len, nul)
int nul;
{
struct mbuf *m;
int count, i;
char *cp;
int count;
/*
* Trim from tail. Scan the mbuf chain,
@ -2175,10 +2174,15 @@ nfs_zeropad(mp, len, nul)
m->m_next = NULL;
}
KDASSERT(m->m_next == NULL);
/*
* zero-padding.
*/
if (nul > 0) {
char *cp;
int i;
if (M_ROMAP(m) || M_TRAILINGSPACE(m) < nul) {
struct mbuf *n;
@ -2186,9 +2190,8 @@ nfs_zeropad(mp, len, nul)
n = m_get(M_WAIT, MT_DATA);
MCLAIM(n, &nfs_mowner);
n->m_len = nul;
n->m_next = m->m_next;
n->m_next = NULL;
m->m_next = n;
m = n;
cp = mtod(n, caddr_t);
} else {
cp = mtod(m, caddr_t) + m->m_len;