From 06bd99086d6f34208978eaad76ef6761e3a3796d Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sat, 21 Mar 2009 21:49:07 +0000 Subject: [PATCH] In nfs_request(), always exit using the nfsmout label once we're definitely doing an NFSv2 or NFSv3 RPC, rather than sometimes doing so and sometimes not. This makes it easier to add a DTrace return probe at a single point in the function. MFC after: 1 week --- sys/nfsclient/nfs_krpc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/nfsclient/nfs_krpc.c b/sys/nfsclient/nfs_krpc.c index 8a5f80506475..ce6a87b906b2 100644 --- a/sys/nfsclient/nfs_krpc.c +++ b/sys/nfsclient/nfs_krpc.c @@ -493,11 +493,8 @@ tryagain: error = EACCES; } md = mrep; - if (error) { - m_freem(mreq); - AUTH_DESTROY(auth); - return (error); - } + if (error) + goto nfsmout; KASSERT(mrep != NULL, ("mrep shouldn't be NULL if no error\n")); @@ -535,9 +532,7 @@ tryagain: error |= NFSERR_RETERR; } else m_freem(mrep); - m_freem(mreq); - AUTH_DESTROY(auth); - return (error); + goto nfsmout; } m_freem(mreq);