From owner-p4-projects@FreeBSD.ORG Wed Nov 29 07:22:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 928A216A47C; Wed, 29 Nov 2006 07:22:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5D49516A403 for ; Wed, 29 Nov 2006 07:22:46 +0000 (UTC) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E71343D7C for ; Wed, 29 Nov 2006 07:22:13 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAT7MDnm024555 for ; Wed, 29 Nov 2006 07:22:13 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAT7MDwN024552 for perforce@freebsd.org; Wed, 29 Nov 2006 07:22:13 GMT (envelope-from scottl@freebsd.org) Date: Wed, 29 Nov 2006 07:22:13 GMT Message-Id: <200611290722.kAT7MDwN024552@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 110661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Nov 2006 07:22:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=110661 Change 110661 by scottl@scottl-x64 on 2006/11/29 07:21:23 Fix a WITNESS warning. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#16 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#16 (text+ko) ==== @@ -1810,7 +1810,9 @@ /* Do a read capacity */ rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcaplong), M_TEMP, - M_WAITOK); + M_NOWAIT); + if (rcap == NULL) + return (ENOMEM); ccb = cam_periph_getccb(periph, /*priority*/1); scsi_read_capacity(&ccb->csio,