From owner-svn-src-all@FreeBSD.ORG Thu Apr 4 20:53:26 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 984EE34F; Thu, 4 Apr 2013 20:53:26 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-we0-x231.google.com (mail-we0-x231.google.com [IPv6:2a00:1450:400c:c03::231]) by mx1.freebsd.org (Postfix) with ESMTP id ADB0FCEC; Thu, 4 Apr 2013 20:53:25 +0000 (UTC) Received: by mail-we0-f177.google.com with SMTP id o45so2354644wer.8 for ; Thu, 04 Apr 2013 13:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=Qh4/cM8o5QqwSugfpp4AYptHZxPn9y2znoW1p9qYjQQ=; b=K73560gMkjdbySk3jSjobeFhwaBGZ9I0M/1YlJE9votARsGAwfzo0HTfGxGSjCZPqh XkEDBA+Nl5XxycQhRedDiwTI2zSwJSm0ej/57xVLSgi2lnOakMIYXSDsuF1kbKswiObY wwyBDovpaXp0viM25JUj8aa3Ik9Uea8gk7aqh6NAxf5oxGn+2AZwn/OaEIJqBZzuE2XM ngGD1v99qhHHZ712FDvVkeJ/MJUqCK7oiuDoaTm2zU19UfwNd25yuNZgQ8WnyEaKBVBo JPk4sPIabBWZwPgCDX7uPeyoI5ijNSEDmvOdT/ml9gtlz08eFghNCmSY6+838IP6LRb9 vMgw== MIME-Version: 1.0 X-Received: by 10.180.77.226 with SMTP id v2mr1551292wiw.33.1365108804875; Thu, 04 Apr 2013 13:53:24 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.216.212.73 with HTTP; Thu, 4 Apr 2013 13:53:24 -0700 (PDT) In-Reply-To: <201304041904.r34J4F2I065527@svn.freebsd.org> References: <201304041904.r34J4F2I065527@svn.freebsd.org> Date: Thu, 4 Apr 2013 13:53:24 -0700 X-Google-Sender-Auth: uoYQITC4VhgHjAtQc0xiopSz3Qk Message-ID: Subject: Re: svn commit: r249105 - in head/sys/cam: ata scsi From: Adrian Chadd To: Alexander Motin Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2013 20:53:26 -0000 Hi, Isn't this a prime candidate to replace with KASSERT()? Thanks, Adrian On 4 April 2013 12:04, Alexander Motin wrote: > Author: mav > Date: Thu Apr 4 19:04:15 2013 > New Revision: 249105 > URL: http://svnweb.freebsd.org/changeset/base/249105 > > Log: > MFprojects/camlock r248930: > Remove extra NULL checks. d_drv1 can never be NULL during periph life cycle. > > MFC after: 2 weeks > > Modified: > head/sys/cam/ata/ata_da.c > head/sys/cam/scsi/scsi_cd.c > head/sys/cam/scsi/scsi_da.c > > Modified: head/sys/cam/ata/ata_da.c > ============================================================================== > --- head/sys/cam/ata/ata_da.c Thu Apr 4 18:59:29 2013 (r249104) > +++ head/sys/cam/ata/ata_da.c Thu Apr 4 19:04:15 2013 (r249105) > @@ -527,10 +527,6 @@ adaopen(struct disk *dp) > int error; > > periph = (struct cam_periph *)dp->d_drv1; > - if (periph == NULL) { > - return (ENXIO); > - } > - > if (cam_periph_acquire(periph) != CAM_REQ_CMP) { > return(ENXIO); > } > @@ -566,9 +562,6 @@ adaclose(struct disk *dp) > union ccb *ccb; > > periph = (struct cam_periph *)dp->d_drv1; > - if (periph == NULL) > - return (ENXIO); > - > cam_periph_lock(periph); > if (cam_periph_hold(periph, PRIBIO) != 0) { > cam_periph_unlock(periph); > @@ -646,10 +639,6 @@ adastrategy(struct bio *bp) > struct ada_softc *softc; > > periph = (struct cam_periph *)bp->bio_disk->d_drv1; > - if (periph == NULL) { > - biofinish(bp, NULL, ENXIO); > - return; > - } > softc = (struct ada_softc *)periph->softc; > > cam_periph_lock(periph); > @@ -704,8 +693,6 @@ adadump(void *arg, void *virtual, vm_off > > dp = arg; > periph = dp->d_drv1; > - if (periph == NULL) > - return (ENXIO); > softc = (struct ada_softc *)periph->softc; > cam_periph_lock(periph); > secsize = softc->params.secsize; > @@ -1038,9 +1025,6 @@ adagetattr(struct bio *bp) > struct cam_periph *periph; > > periph = (struct cam_periph *)bp->bio_disk->d_drv1; > - if (periph == NULL) > - return (ENXIO); > - > cam_periph_lock(periph); > ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute, > periph->path); > > Modified: head/sys/cam/scsi/scsi_cd.c > ============================================================================== > --- head/sys/cam/scsi/scsi_cd.c Thu Apr 4 18:59:29 2013 (r249104) > +++ head/sys/cam/scsi/scsi_cd.c Thu Apr 4 19:04:15 2013 (r249105) > @@ -386,7 +386,6 @@ cddiskgonecb(struct disk *dp) > struct cam_periph *periph; > > periph = (struct cam_periph *)dp->d_drv1; > - > cam_periph_release(periph); > } > > @@ -1073,9 +1072,6 @@ cdopen(struct disk *dp) > int error; > > periph = (struct cam_periph *)dp->d_drv1; > - if (periph == NULL) > - return (ENXIO); > - > softc = (struct cd_softc *)periph->softc; > > if (cam_periph_acquire(periph) != CAM_REQ_CMP) > @@ -1120,9 +1116,6 @@ cdclose(struct disk *dp) > struct cd_softc *softc; > > periph = (struct cam_periph *)dp->d_drv1; > - if (periph == NULL) > - return (ENXIO); > - > softc = (struct cd_softc *)periph->softc; > > cam_periph_lock(periph); > @@ -1473,11 +1466,6 @@ cdstrategy(struct bio *bp) > struct cd_softc *softc; > > periph = (struct cam_periph *)bp->bio_disk->d_drv1; > - if (periph == NULL) { > - biofinish(bp, NULL, ENXIO); > - return; > - } > - > cam_periph_lock(periph); > CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, > ("cdstrategy(%p)\n", bp)); > @@ -1972,9 +1960,6 @@ cdioctl(struct disk *dp, u_long cmd, voi > int nocopyout, error = 0; > > periph = (struct cam_periph *)dp->d_drv1; > - if (periph == NULL) > - return(ENXIO); > - > cam_periph_lock(periph); > > softc = (struct cd_softc *)periph->softc; > > Modified: head/sys/cam/scsi/scsi_da.c > ============================================================================== > --- head/sys/cam/scsi/scsi_da.c Thu Apr 4 18:59:29 2013 (r249104) > +++ head/sys/cam/scsi/scsi_da.c Thu Apr 4 19:04:15 2013 (r249105) > @@ -962,10 +962,6 @@ daopen(struct disk *dp) > int error; > > periph = (struct cam_periph *)dp->d_drv1; > - if (periph == NULL) { > - return (ENXIO); > - } > - > if (cam_periph_acquire(periph) != CAM_REQ_CMP) { > return (ENXIO); > } > @@ -1027,9 +1023,6 @@ daclose(struct disk *dp) > struct da_softc *softc; > > periph = (struct cam_periph *)dp->d_drv1; > - if (periph == NULL) > - return (0); > - > cam_periph_lock(periph); > if (cam_periph_hold(periph, PRIBIO) != 0) { > cam_periph_unlock(periph); > @@ -1118,10 +1111,6 @@ dastrategy(struct bio *bp) > struct da_softc *softc; > > periph = (struct cam_periph *)bp->bio_disk->d_drv1; > - if (periph == NULL) { > - biofinish(bp, NULL, ENXIO); > - return; > - } > softc = (struct da_softc *)periph->softc; > > cam_periph_lock(periph); > @@ -1174,8 +1163,6 @@ dadump(void *arg, void *virtual, vm_offs > > dp = arg; > periph = dp->d_drv1; > - if (periph == NULL) > - return (ENXIO); > softc = (struct da_softc *)periph->softc; > cam_periph_lock(periph); > secsize = softc->params.secsize; > @@ -1250,9 +1237,6 @@ dagetattr(struct bio *bp) > struct cam_periph *periph; > > periph = (struct cam_periph *)bp->bio_disk->d_drv1; > - if (periph == NULL) > - return (ENXIO); > - > cam_periph_lock(periph); > ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute, > periph->path); > @@ -1295,7 +1279,6 @@ dadiskgonecb(struct disk *dp) > struct cam_periph *periph; > > periph = (struct cam_periph *)dp->d_drv1; > - > cam_periph_release(periph); > } >