From 0b0d4c725a5c3181d2d451d48cc2200dd3f52bd9 Mon Sep 17 00:00:00 2001 From: Andy Yan Date: Thu, 27 Jan 2011 02:03:24 +0000 Subject: [PATCH] sync with latest libsas code at function sas_change_queue_depth. Fixed a compile warning. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3230 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- mvsas_tgt/mv_sas.c | 14 ++++---------- mvsas_tgt/mv_tgt.c | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/mvsas_tgt/mv_sas.c b/mvsas_tgt/mv_sas.c index 6dc041aaa..4fc32b1d8 100644 --- a/mvsas_tgt/mv_sas.c +++ b/mvsas_tgt/mv_sas.c @@ -411,17 +411,11 @@ int mvs_slave_configure(struct scsi_device *sdev) if (ret) return ret; - if (dev_is_sata(dev)) { - /* may set PIO mode */ - #if MV_DISABLE_NCQ - struct ata_port *ap = dev->sata_dev.ap; - struct ata_device *adev = ap->link.device; - adev->flags |= ATA_DFLAG_NCQ_OFF; - scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, 1); - #endif - } else - sas_change_queue_depth(sdev, MVS_QUEUE_SIZE); + if (!dev_is_sata(dev)) + sas_change_queue_depth(sdev, + MVS_QUEUE_SIZE, + SCSI_QDEPTH_DEFAULT); return 0; } diff --git a/mvsas_tgt/mv_tgt.c b/mvsas_tgt/mv_tgt.c index 858e94b4e..c7eb06ce2 100644 --- a/mvsas_tgt/mv_tgt.c +++ b/mvsas_tgt/mv_tgt.c @@ -316,7 +316,7 @@ static int mvst_target_release(struct scst_tgt *scst_tgt) wait_event(tgt->waitQ, test_tgt_sess_count(tgt, mvi)); /* big hammer */ - if (!mvi->flags & MVF_HOST_SHUTTING_DOWN) + if (!(mvi->flags & MVF_HOST_SHUTTING_DOWN)) mvi->flags |= MVF_TARGET_MODE_ENABLE; /* wait for sessions to clear out (just in case) */