Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Mar 2013 23:25:46 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r247737 - head/sys/kern
Message-ID:  <201303032325.r23NPk50030011@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pjd
Date: Sun Mar  3 23:25:45 2013
New Revision: 247737
URL: http://svnweb.freebsd.org/changeset/base/247737

Log:
  Use dedicated malloc type for filecaps-related data, so we can detect any
  memory leaks easier.

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Sun Mar  3 23:23:35 2013	(r247736)
+++ head/sys/kern/kern_descrip.c	Sun Mar  3 23:25:45 2013	(r247737)
@@ -104,6 +104,7 @@ static MALLOC_DEFINE(M_FILEDESC, "filede
 static MALLOC_DEFINE(M_FILEDESC_TO_LEADER, "filedesc_to_leader",
     "file desc to leader structures");
 static MALLOC_DEFINE(M_SIGIO, "sigio", "sigio structures");
+MALLOC_DEFINE(M_FILECAPS, "filecaps", "descriptor capabilities");
 
 MALLOC_DECLARE(M_FADVISE);
 
@@ -1389,7 +1390,7 @@ filecaps_copy(const struct filecaps *src
 		    ("fc_ioctls != NULL, but fc_nioctls=%hd", src->fc_nioctls));
 
 		size = sizeof(src->fc_ioctls[0]) * src->fc_nioctls;
-		dst->fc_ioctls = malloc(size, M_TEMP, M_WAITOK);
+		dst->fc_ioctls = malloc(size, M_FILECAPS, M_WAITOK);
 		bcopy(src->fc_ioctls, dst->fc_ioctls, size);
 	}
 }
@@ -1425,7 +1426,7 @@ void
 filecaps_free(struct filecaps *fcaps)
 {
 
-	free(fcaps->fc_ioctls, M_TEMP);
+	free(fcaps->fc_ioctls, M_FILECAPS);
 	bzero(fcaps, sizeof(*fcaps));
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303032325.r23NPk50030011>