Commit 5473860f authored by Martin Blix Grydeland's avatar Martin Blix Grydeland

Don't use acct as variable name

This triggers 'shadows global' build errors.
parent 4b9ec988
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
/* Close a connection ------------------------------------------------*/ /* Close a connection ------------------------------------------------*/
void void
VDI_CloseFd(struct vbc **vbp, const struct acct_bereq *acct) VDI_CloseFd(struct vbc **vbp, const struct acct_bereq *acct_bereq)
{ {
struct backend *bp; struct backend *bp;
struct vbc *vc; struct vbc *vc;
...@@ -64,7 +64,7 @@ VDI_CloseFd(struct vbc **vbp, const struct acct_bereq *acct) ...@@ -64,7 +64,7 @@ VDI_CloseFd(struct vbc **vbp, const struct acct_bereq *acct)
vc->vsl = NULL; vc->vsl = NULL;
VTCP_close(&vc->fd); VTCP_close(&vc->fd);
VBE_DropRefConn(bp, acct); VBE_DropRefConn(bp, acct_bereq);
vc->backend = NULL; vc->backend = NULL;
VBE_ReleaseConn(vc); VBE_ReleaseConn(vc);
} }
...@@ -72,7 +72,7 @@ VDI_CloseFd(struct vbc **vbp, const struct acct_bereq *acct) ...@@ -72,7 +72,7 @@ VDI_CloseFd(struct vbc **vbp, const struct acct_bereq *acct)
/* Recycle a connection ----------------------------------------------*/ /* Recycle a connection ----------------------------------------------*/
void void
VDI_RecycleFd(struct vbc **vbp, const struct acct_bereq *acct) VDI_RecycleFd(struct vbc **vbp, const struct acct_bereq *acct_bereq)
{ {
struct backend *bp; struct backend *bp;
struct vbc *vc; struct vbc *vc;
...@@ -95,7 +95,7 @@ VDI_RecycleFd(struct vbc **vbp, const struct acct_bereq *acct) ...@@ -95,7 +95,7 @@ VDI_RecycleFd(struct vbc **vbp, const struct acct_bereq *acct)
Lck_Lock(&bp->mtx); Lck_Lock(&bp->mtx);
VSC_C_main->backend_recycle++; VSC_C_main->backend_recycle++;
VTAILQ_INSERT_HEAD(&bp->connlist, vc, list); VTAILQ_INSERT_HEAD(&bp->connlist, vc, list);
VBE_DropRefLocked(bp, acct); VBE_DropRefLocked(bp, acct_bereq);
} }
/* Get a connection --------------------------------------------------*/ /* Get a connection --------------------------------------------------*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment