Message ID | 201804021428.w32ESJC6023667@finist_ce7.work |
---|---|
State | New |
Series | "target: backport bug fixes from the upstream kernel" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.71.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Mon, 02 Apr 2018 16:31:03 +0200 (CEST) Received: by 10.46.158.71 with SMTP id g7csp2490428ljk; Mon, 2 Apr 2018 07:30:45 -0700 (PDT) X-Google-Smtp-Source: AIpwx49/DzS2ASlGptVo9e8xzHSbBnHCRo6fxpjJWy/qjqNi/PGaWSRxgqHbopW6PgiCAGe4s9oy X-Received: by 10.101.80.205 with SMTP id s13mr6316248pgp.285.1522679445120; Mon, 02 Apr 2018 07:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522679445; cv=none; d=google.com; s=arc-20160816; b=At/Hv1s+hDP21tS4tLi2jQUC83SLSiyE/sQM6y205k+RkDMfa/kNaaBTsKXJ53n10A nGfr9kHdg5zU6RcE6CaEB2TVNt0usSPnGJXY0JC7moFQhZEGpf9buLk9Vf0QzUfzSSJi xI7uquPzBEUhgNz76MjjLegfUlUGw/2slAoUN+TVK4TwvOvdF8bmLwNsoRhhMkKjWc9W IJBzPvswFMgEi1q/QI1g+3NihQXnni2XJ+BGn+k+GrBe5MXdTIdu1RDausZyubNBCtPL pTichfe0nzUkvuqkD6a4HTYE8UrqwXJ/5ekVo8MQ5DBsjrkpvYxJ6XiJQO0knuaOXjQw F4/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:spamdiagnosticoutput:mime-version:in-reply-to:to:from:message-id :date:arc-authentication-results; bh=Ig8RNrXRfX9jqx4kSlREtL7xexF+cG1buGTNCsBvfl0=; b=qq+cqWdC1RWMxQXyGz5XgjHnMmv+ceKTDrM5ax6cLFF/LQVS4Vnn/CwSCL706ua9lW dAd32Kwl36eS6xIkQh4nqRmkpPVRYRaEr+sHPdop3S+Gy13GJvx1NP/nqSM6wA6EvU8S VZEYWYCQnilqECB+/lxKW5EWldoQDIaSUnElT6X9Vj2Inb9dIPaZTqYooO1nYCM9tZDW hqCFSt8yRMZpkjWNEYlgRMJ6K9jadDk9CwFx4rqFsdRls5+0o0i+0KchEo9KHSCC/gHX JKCdWmOvomVCthM3Zbao4CG8HOkgr45FUMCLyOzYpvp2YM6Sqqs9gG3h+T1jla1JBPeX iCYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id 133si301121pgf.228.2018.04.02.07.30.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 07:30:45 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w32ESrEm017345; Mon, 2 Apr 2018 17:28:53 +0300 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0246.outbound.protection.outlook.com [213.199.154.246]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w32ESkx6017293 for <devel@openvz.org>; Mon, 2 Apr 2018 17:28:46 +0300 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from finist_ce7.work (195.214.232.6) by AM0PR08MB3105.eurprd08.prod.outlook.com (2603:10a6:208:5c::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Mon, 2 Apr 2018 14:28:23 +0000 Received: from finist_ce7.work (localhost [127.0.0.1]) by finist_ce7.work (Postfix) with ESMTP id 8B030602FD; Mon, 2 Apr 2018 17:28:19 +0300 (MSK) Received: (from khorenko@localhost) by finist_ce7.work (8.14.7/8.14.7/Submit) id w32ESJC6023667; Mon, 2 Apr 2018 17:28:19 +0300 Date: Mon, 2 Apr 2018 17:28:19 +0300 Message-Id: <201804021428.w32ESJC6023667@finist_ce7.work> X-Authentication-Warning: finist_ce7.work: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Andrei Vagin <avagin@openvz.org> In-Reply-to: <1522172237-6960-2-git-send-email-avagin@openvz.org> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0701CA0049.eurprd07.prod.outlook.com (2603:10a6:3:9e::17) To AM0PR08MB3105.eurprd08.prod.outlook.com (2603:10a6:208:5c::30) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 864058b5-21c3-4877-1bd3-08d598a5fd97 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3105; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3105; 3:xlhGVNPJSOk8LM9C9drgLV9eGf1MEbYn/06KlRaBC3wCxmoRyYXX1IxkqZQI6TyooKJPiDoRQiS4fwvk1gl8GeNuQFZXg0MbyU+gjZV0LDcOKfOuBsM0dpNbcB12oqsujP6TU0l6JOxjbxQkojBtmB8RNU/9JZdR2vc36dtuVXyg+7f2XBhjVTZdt/kbaA5/VTPf1jpVrvWQO0hdzRO9r/tEE6+53ftqF36BxZqrd7eRsl4igAVycfCrdLpHwNyL; 25:vM4/xYki2cgKX7Z+Pn3NaXeZpk2wA1wYAvl3cic/RaYB5qK73Pz2wP726kfdkw8/rAH2bTL5gYnFY3r4W1nsFiwPTU8WmOvl8DszslBhRS1NGErDvMi6MmII4anO6Oll8Le148/orxUM8V4AjrFtlDhk/vEpcD61yCmRIfHSPJTgFw+LuKXWJP2f4Wzejt4piva3+0eCJgUI6VeE8zs08CRzPlYx5ZNG1rgmaYRPdfxQCw/liQhqvBL3xnnp7RfG8j6FOZSuBzo9pIqVaKfKb924errxluwV8OZ8tJfi0ApYBDxgmFf6GlXoj4jD6IFg/tbwJK7raW0Iu0KEOEw5Ng==; 31:YyfjWysfYQeltEWF0qcagPvQVBhzvf8QR/6Y+EoMNGl/KTTd4HLtnyTDGvB7gOoKe9Trz6lXZ1FjekdWTBjTAACW4ikMQkYuWZ8ZTX1hiP0xq+C6/Zj5Oxq29/ZV0edq3ICebmq3XJcdG2ykwp/rV8DDcg9spR2Vy1De0rgz83BbcAkQCBE50Szyz6fzFLOnQkEndR/NNhR6yzkk7dcyRSoE31pV2vCZH93S6BOfXN0= X-MS-TrafficTypeDiagnostic: AM0PR08MB3105: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3105; 20:MGs28xPml2ye8pzk7xK5GJD6FO78kyPR/MegaEcn1TB4FKVcIAuNjfOVzPZC8yFtnchiwCehmW7Jsv/gFtln4eczBJkChPYp5DpkXmsLhAkymecwFAloL2sLWes85QHJFjbLQz2iOREJREiUlR2C4H1Rnr4geTCe6jgxN729gP/j68DnMtnzjkP8DVJZBjclzzDnr7MVoFZd3EVEwALM97T4Sn2F8GGmBTO4mK3vW7V+49ygVSduwrlO/Q0aEHJE0XG5km6dU8AUzjNpMmYCm/eO/6EGKKcUh2Mva93jjAnHtLrL0FisAk9gq6BKYtZGeeun5OBUsy8J+EYE4pk7n8CXNq54wFLXx98sZRzDYMcnqHt5S9kzlF4fjzW3RxKSrAo1wRuPM6NgiBaGrSzUaojoQrlmfSyYlp1K6ZMTrKplUVzHNiU1vH6ggPZ1XgoHD9JmqNKJdz35lKSwy8h7cBsDoqYtYLbkOqr9Qu4ndSL7fkEuKxhoZjVqNFH2A57y; 4:zDyKSVK2StSa96KpfzVM+QqhqsvDiDY8js5b1Ox2wW51mEFLPe0lMG1mGQjwVvHN80/uGJpOdzJ8u2LcwXikse6PdFTmjV9tOVjiKyXQnrTUo8j2uvPd/ZcbbuCyjRuTcaqi9fwNWxs39h3eWmodFp6y9MiZgQL2evaMbm+gL1ctrJO5XdzRfmPm+454v8Q1tgpgQL0z0w7oYZx+vYZXz+e00vNq6M2mG6Px0xGjIuIlUx/aC/V4UTNFQk7XuYOcfcA0mkVMUfQ9wY58wiAvTzQ3iUODW/RiKAd5t5ya9TYnvc6MfmHSJllckIMqUXrT X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(2401047)(8121501046)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(201708071742011); SRVR:AM0PR08MB3105; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3105; X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:AM0PR08MB3105; H:finist_ce7.work; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3105; 23:1yDalr6KAext4b489w8IloUKGlXL6fQmTxw+VeLy9ZEVNeooWZm7vWtr2EFXgZwWccL5qLkgsmL6yXz7140kEnZhL9tHZgNGa6dw3tMhVin++/XkpFLR7B4AGvV85n2Zgbsp1kZjsOUtWZLVcH8keQ==; 6:9XJqVai/LMUdM5AQau8a7rdnZeL9PD+6SFOWMUhlX2p65ZBTCtc0qXKG+fvsE9TYalcWJGq4Tx523HmZqLyy9hY4ZMy+EyIixPjictLYUTaZxNTtiO+SQZAjPQSQNpzLedwKoNLMfTEu95zMFKzJBHB1hcZmr8AicVjt1S1KLiVRBXjNPg7fNSmd9Opoj0DCNYOPWoWYgnD+2Npi04wIK/+zjznBxgjlH5aa7hBli8NjN1Ag6dqsvyU38WBA7Bcr0D12PES8XJPnax61wu/lu7b/ZB2YjFSRTjnintFLXczm9pQXis91wjNdV0aqYMFuw6NChF+JSCQud09P2R3F4m5pcXHwkWJNw3OsjzMyghCEk4uiEYmhAHBzfGpDCtDR9weYkqveqQYC08IdOR4oxpPPLUfUs7wqVy6r+dHzSJim+8Vv4Ug1Epz5TEYrUXFMaIl5vFgEE1cAVxv1sSfRsA==; 5:M2QeGoe4/z6+6WAZ5ziYXShlGjHxPipl1w7UFmDPWN0nYeWnPa39v8dFEL5b1Fp56m4YHacFnqYcP/3gkXybcLxrsWbzotVX4D+HfiaDNz2LG69tDEUR2abElajOjfJV8NI2Iz5QWt6eO02JawPEGQg0TXor+39nnHpQu0HsLRk=; 24:cB7DvL5RdhHXE1S+KJ+IbgQ53gryneouI5O4YH82gBgp9KE3ruatFrqpn8BEmE6RYOaoEQG0XdKQMcbdV7flRZnvfaYnT6RshQTzOK12Vm8= X-Microsoft-Antispam-Message-Info: 2rLm/yEaBwhcBUh4jR1aCDu2rzxa/AObVZo3KPA0UEcBp9e6KMnvgQgXUTyExA6eM7xut2COonGdmSnWi0odYAmKyMnbdH0ZdEyjH+6JgqDoXJzR3q014VTKlwurUYQhp0fj7it9wTKIg36dA3aLfJ68AgRwZY91vpFU/7LmuGrKOtoRX8P90GiGVYpOyQ6Q SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3105; 7:aUFIq7xLSAmnfkPFY2HfKNmS/8IAfOes36Ng87xpZssvqahzApAKxo9ceSVZta+tWFDW+8sbzC+v4zbcoELoSSr5nkOLMNxKa9BRh+rLwhAKVr2ERziwOQA+GSKplPzdFIkRHJp4etp5v23T6v9WNl9PlhJWCwkozKvfJcDSDS97Uq2gKXeGkvbjKCXAaB8RjynufN/mdFlloLopKovE1rQSuSh7hFwPPPmx9RSOiojQd5ceOZXRa0vbsQZUjQUa; 20:qfaSQEz1ky9YI6UptH9z02+MZhkyq9iOa5UAzIIEdqmdKqEE7qiDu+TmzZglLZMKYRoNr7dLG/StAM7M0jRHDwE9FNP7BGO6pJ451AU/DJUYuQOYPe3oorcQcnUA08depWdJHV7MCZNN8AE8dimpwgPiSRrxf7ltdx0+pTAC0/0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2018 14:28:23.3732 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 864058b5-21c3-4877-1bd3-08d598a5fd97 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3105 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: AM0PR08MB3105.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM0PR08MB3105.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] ms/target: Fix VERIFY_16 handling in sbc_parse_cdb X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/drivers/target/target_core_sbc.c b/drivers/target/target_core_sbc.c index 4be6c69537ae..8a799a8860b7 100644 --- a/drivers/target/target_core_sbc.c +++ b/drivers/target/target_core_sbc.c @@ -1018,9 +1018,15 @@ sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops) return ret; break; case VERIFY: + case VERIFY_16: size = 0; - sectors = transport_get_sectors_10(cdb); - cmd->t_task_lba = transport_lba_32(cdb); + if (cdb[0] == VERIFY) { + sectors = transport_get_sectors_10(cdb); + cmd->t_task_lba = transport_lba_32(cdb); + } else { + sectors = transport_get_sectors_16(cdb); + cmd->t_task_lba = transport_lba_64(cdb); + } cmd->execute_cmd = sbc_emulate_noop; goto check_lba; case REZERO_UNIT: