svn commit: r267794 - stable/9/sys/cam/ctl

[Alexander Motin]

Author: mav
Date: Mon Jun 23 13:23:51 2014
New Revision: 267794
URL: http://svnweb.freebsd.org/changeset/base/267794

Log:
  MFC r267429:
  Fix some leaks on LUN creation error.

Modified:
  stable/9/sys/cam/ctl/ctl_backend_block.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- stable/9/sys/cam/ctl/ctl_backend_block.c	Mon Jun 23 13:20:14 2014	(r267793)
+++ stable/9/sys/cam/ctl/ctl_backend_block.c	Mon Jun 23 13:23:51 2014	(r267794)
@@ -1818,9 +1818,14 @@ ctl_be_block_create(struct ctl_be_block_
 bailout_error:
 	req->status = CTL_LUN_ERROR;
 
+	if (be_lun->io_taskqueue != NULL)
+		taskqueue_free(be_lun->io_taskqueue);
 	ctl_be_block_close(be_lun);
-
-	free(be_lun->dev_path, M_CTLBLK);
+	if (be_lun->dev_path != NULL)
+		free(be_lun->dev_path, M_CTLBLK);
+	if (be_lun->lun_zone != NULL)
+		uma_zdestroy(be_lun->lun_zone);
+	mtx_destroy(&be_lun->lock);
 	free(be_lun, M_CTLBLK);
 
 	return (retval);