From owner-svn-src-projects@FreeBSD.ORG  Wed Aug 18 07:32:24 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BF9EB1065673;
	Wed, 18 Aug 2010 07:32:24 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF6438FC16;
	Wed, 18 Aug 2010 07:32:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7I7WOau058312;
	Wed, 18 Aug 2010 07:32:24 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7I7WO4g058310;
	Wed, 18 Aug 2010 07:32:24 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201008180732.o7I7WO4g058310@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Wed, 18 Aug 2010 07:32:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211442 - projects/ofed/head/sys/ofed/include/linux
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Aug 2010 07:32:24 -0000

Author: jeff
Date: Wed Aug 18 07:32:24 2010
New Revision: 211442
URL: http://svn.freebsd.org/changeset/base/211442

Log:
   - Properly initialize the free dr bitmap.
   - Reset the leaf bitmap when freeing an idr item.
   - Add a lookup and assert after add to catch any other bugs early.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/linux_idr.c

Modified: projects/ofed/head/sys/ofed/include/linux/linux_idr.c
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/linux_idr.c	Wed Aug 18 07:31:28 2010	(r211441)
+++ projects/ofed/head/sys/ofed/include/linux/linux_idr.c	Wed Aug 18 07:32:24 2010	(r211442)
@@ -146,6 +146,7 @@ idr_remove(struct idr *idr, int id)
 		panic("idr_remove: Item %d not allocated (%p, %p)\n",
 		    id, idr, il);
 	il->ary[idx] = NULL;
+	il->bitmap |= 1 << idx;
 	mtx_unlock(&idr->lock);
 	return;
 }
@@ -226,7 +227,7 @@ idr_pre_get(struct idr *idr, gfp_t gfp_m
 			iln = malloc(sizeof(*il), M_IDR, M_ZERO | gfp_mask);
 			if (iln == NULL)
 				break;
-			iln->bitmap = IDR_MASK;
+			bitmap_fill(&iln->bitmap, IDR_SIZE);
 			if (head != NULL) {
 				il->ary[0] = iln;
 				il = iln;
@@ -327,6 +328,10 @@ idr_get_new(struct idr *idr, void *ptr, 
 	error = 0;
 out:
 	mtx_unlock(&idr->lock);
+	if (error == 0 && idr_find(idr, id) != ptr) {
+		panic("idr_get_new: Failed for idr %p, id %d, ptr %p\n",
+		    idr, id, ptr);
+	}
 	return (error);
 }