Date: Thu, 25 Aug 2011 11:02:02 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r225173 - projects/zfsd/head/sys/cam/scsi Message-ID: <201108251102.p7PB22w5000857@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Thu Aug 25 11:02:01 2011 New Revision: 225173 URL: http://svn.freebsd.org/changeset/base/225173 Log: Remove some strange lock operations. Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc.c projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc.c ============================================================================== --- projects/zfsd/head/sys/cam/scsi/scsi_enc.c Thu Aug 25 10:00:38 2011 (r225172) +++ projects/zfsd/head/sys/cam/scsi/scsi_enc.c Thu Aug 25 11:02:01 2011 (r225173) @@ -242,10 +242,8 @@ enc_open(struct cdev *dev, int flags, in return (ENXIO); } - if (cam_periph_acquire(periph) != CAM_REQ_CMP) { - cam_periph_unlock(periph); + if (cam_periph_acquire(periph) != CAM_REQ_CMP) return (ENXIO); - } cam_periph_lock(periph); @@ -273,9 +271,6 @@ enc_close(struct cdev *dev, int flag, in { struct cam_periph *periph; struct enc_softc *softc; - int error; - - error = 0; periph = (struct cam_periph *)dev->si_drv1; if (periph == NULL) Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c ============================================================================== --- projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Thu Aug 25 10:00:38 2011 (r225172) +++ projects/zfsd/head/sys/cam/scsi/scsi_enc_ses.c Thu Aug 25 11:02:01 2011 (r225173) @@ -2563,8 +2563,6 @@ ses_set_enc_status(enc_softc_t *enc, uin enc_update_request(enc, SES_PROCESS_CONTROL_REQS); cam_periph_sleep(enc->periph, &req, PUSER, "encstat", 0); - sx_slock(&enc->enc_cache_lock); - return (req.result); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108251102.p7PB22w5000857>