From f46620ae374ea61cbb68746c3da2ad4c05cf2258 Mon Sep 17 00:00:00 2001 From: dfr Date: Tue, 18 Mar 2008 18:42:59 +0000 Subject: Don't call nfs_realign while holding locks. Reviewed by: kib --- sys/nfsserver/nfs_srvsock.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sys/nfsserver/nfs_srvsock.c') diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index 678191b..cb4c69e 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -651,15 +651,16 @@ nfsrv_getstream(struct nfssvc_sock *slp, int waitflag) NFSD_UNLOCK(); rec = malloc(sizeof(struct nfsrv_rec), M_NFSRVDESC, waitflag == M_DONTWAIT ? M_NOWAIT : M_WAITOK); - NFSD_LOCK(); - if (!rec) { - m_freem(slp->ns_frag); - } else { + if (rec) { nfs_realign(&slp->ns_frag, 10 * NFSX_UNSIGNED); rec->nr_address = NULL; rec->nr_packet = slp->ns_frag; STAILQ_INSERT_TAIL(&slp->ns_rec, rec, nr_link); } + NFSD_LOCK(); + if (!rec) { + m_freem(slp->ns_frag); + } slp->ns_frag = NULL; } } -- cgit v1.1