From patchwork Wed Sep 24 09:00:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 392811 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id B0899140095; Wed, 24 Sep 2014 19:01:10 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XWiRg-0003TF-8T; Wed, 24 Sep 2014 09:01:08 +0000 Received: from mail-wi0-f181.google.com ([209.85.212.181]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XWiRS-0003Oj-M5 for kernel-team@lists.ubuntu.com; Wed, 24 Sep 2014 09:00:54 +0000 Received: by mail-wi0-f181.google.com with SMTP id z2so6767254wiv.8 for ; Wed, 24 Sep 2014 02:00:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Sy+5ABc3JOIg+GQsX07dNtBWqs8ZNO2CRu0wDvlK/Ag=; b=YYhve9tnOe10lcdJ/vzSRTkrKu9c92bxE0ZeS7DbXd184yhmU2o8pEx0PLDZjX8iBy i9gwNf8A1EZlsqwxb9fsHbMyiabCt8s7cR/4hmzrWAdWQ4z9A2T3W0V7oyVdPLIw+YLX 7KpKcBAuuf/MfWcS52Gs2uV3ll6HnCj/4vxEFUdNSfCCocg4SS/+CP1y89VvuJ/KOHFk Z06W2wCxUoNxfZ2E0HlHoKICyHil6oM1XVMJ5dnwvLisCTG6i+4zuOwn7Q5biMxTeS+2 QwlCKvYegeCOnemGzQaB8OGUOReKDXIkp92Coo70aBkOpyEWd795L26DbI0dR3u2I2dk ZQfg== X-Gm-Message-State: ALoCoQm6lvVo1SwtNJe0b8D9zhzBqiGcdx4f8myWe4EUT1eXTSExlHxTSIkpckclZHmJArKmpThx X-Received: by 10.195.11.200 with SMTP id ek8mr6326120wjd.85.1411549254533; Wed, 24 Sep 2014 02:00:54 -0700 (PDT) Received: from localhost ([2001:470:6973:2:78b9:724f:ec05:5c33]) by mx.google.com with ESMTPSA id ll20sm5031670wic.14.2014.09.24.02.00.53 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 24 Sep 2014 02:00:53 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 01/11] Revert "UBUNTU: SAUCE: scsi: hyper-v storsvc switch up to SPC-3" Date: Wed, 24 Sep 2014 10:00:37 +0100 Message-Id: <1411549247-6511-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1411549247-6511-1-git-send-email-apw@canonical.com> References: <1411549247-6511-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This reverts commit 1cbbe45e891a262e95f7d0c44c23e6d4f85e936e. BugLink: http://bugs.launchpad.net/bugs/1354397 Signed-off-by: Andy Whitcroft --- drivers/scsi/storvsc_drv.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index 3903c8a..9969fa1 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -1441,14 +1441,6 @@ static int storvsc_device_configure(struct scsi_device *sdevice) sdevice->no_write_same = 1; - /* - * hyper-v lies about its capabilities indicating it is only SPC-2 - * compliant, but actually implements the core SPC-3 features. - * If we pretend to be SPC-3, we send RC16 which activates trim and - * will query the appropriate VPD pages to enable trim. - */ - sdevice->scsi_level = SCSI_SPC_3; - return 0; }