From patchwork Thu Mar 1 15:27:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130280 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952140edc; Thu, 1 Mar 2018 07:38:19 -0800 (PST) X-Google-Smtp-Source: AG47ELs+SidUndqTufAY8vTtmIcca0PXw7WaPhuahWsFYmJcbAvmpIg85Cd1wImkIENZ+3pyQK4n X-Received: by 10.98.162.26 with SMTP id m26mr2341100pff.217.1519918699350; Thu, 01 Mar 2018 07:38:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918699; cv=none; d=google.com; s=arc-20160816; b=gl1OHAv2bLGuoyJFdKAJlH+xLo5lK3heed7xfhBbZGsbWbk1fBKDOeg3Uzpkgkm+lf 4haA/Eg1sXYymFyp4zMWUqaLihiT9z6vSUKgbFGvwpTMmvZCvg3yFYRsOTufJBwXOvIW IRBeCxDCDP8yZvePH5K239tFzj6omRGL5n9jhBnqGAO4WsRnU3qBVxanXFd8l63NlDtf NFk1iyzDQo0x4lIEiBRKwXu8BzCyOeuVp0aBVLbZpsyyf79WCjQ+buy9W5gsvL53RCGc X+j/p4b9q4nzxzqfd1Ds5MJiVxyrKjxZ57N/0Nv+NC7b+cyIqotC906nQgkrz0qRyB1B tChw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=dG8PCSYJaTuKimbIv3k9nAACqnkhovyC5HV1eqNl9hc=; b=LwmC7Moyiu095yjgro7sxYDkUf2WoAzqb88x3WqnkGPBmKHyJYQvThrhr62eRjCT8a toi9RXv+xaRCtNRnqzH78jDck0w19hzYkPTQJy9jmKv492cKm9ol2YmVmxVWd6Gzdo2P 2SjS7Bp757bL4e3PC0b1pIi58xBl/8OWH/OUeHCu9CL8fflLVxD5OJuMUcoL57/I2SN2 KzlxDNIuIYGcjnrcu/lwyWZl9etLA7WpNdY1/vviyyGedJAwYW5yDwAVo745sgZLZ1g6 QM5Au9CqA29HHK3NGHqagk5m07kuc/vLhwIe/MRvP753HpGdmpzeL4dKnG8YHE9BG03A x0CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=UyYyNQq+; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d24-v6si3165005plr.615.2018.03.01.07.38.19; Thu, 01 Mar 2018 07:38:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=UyYyNQq+; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032555AbeCAPiQ (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:16 -0500 Received: from mail-bn3nam01on0104.outbound.protection.outlook.com ([104.47.33.104]:2464 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032278AbeCAPhw (ORCPT ); Thu, 1 Mar 2018 10:37:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dG8PCSYJaTuKimbIv3k9nAACqnkhovyC5HV1eqNl9hc=; b=UyYyNQq+UISECdbbjSllvw1qFTcAJQ7eU7JYZ6MjjcE0CeVD6ca2gV35ALfOvapUFgH9kxWOIaOJdOZ/Ohl37QKfZDVEAfheC80XPVdtm0bYjhmyemrfE9EoY9HzgJo7I8XkRFW+m9n8Sj6EaH/oJLqv/3/EZrr639UzarznOnc= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0902.namprd21.prod.outlook.com (52.132.132.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:37:46 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:37:46 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , NeilBrown , Sasha Levin Subject: [added to the 4.1 stable tree] md: avoid warning for 32-bit sector_t Thread-Topic: [added to the 4.1 stable tree] md: avoid warning for 32-bit sector_t Thread-Index: AQHTsXHHlm3c2YBOEkyW7UZBu3RnIg== Date: Thu, 1 Mar 2018 15:27:15 +0000 Message-ID: <20180301152116.1486-446-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0902; 7:ESxkm/k/n4rbTVjz98EADm1Z+vnk8YaG2x8qKfCElJRzjKbDE69eDANnaXvlpsj+wbG5ud5xtUMmSJ5DGwT3Xu+FGcv1YFDqaYWSWRAk+1DMqCzu/A8RkcRAlnMZxPtJ0c2vw7eedN9mObZ+5TZbpkBBXgaqMVuXg952u061OxFQj/gytYAx8axNYHLrOrqTfq7Z+HoT2gXxjglBf0NfDeKrZQ4kEuY0TOfaUkHpnMJU1ofOwOWo57x3FRqTHAqE x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 9c7d611b-d271-4eb5-584d-08d57f8a61e5 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501229)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0902; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0902; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(376002)(39380400002)(39860400002)(346002)(199004)(189003)(6116002)(72206003)(1076002)(3846002)(25786009)(2900100001)(36756003)(14454004)(316002)(3660700001)(6666003)(54906003)(110136005)(2950100002)(305945005)(7736002)(99286004)(5250100002)(86612001)(10090500001)(107886003)(66066001)(106356001)(2501003)(6512007)(6486002)(97736004)(6436002)(22452003)(68736007)(81166006)(8676002)(81156014)(53936002)(186003)(26005)(105586002)(3280700002)(8936002)(76176011)(478600001)(4326008)(10290500003)(86362001)(5660300001)(2906002)(6506007)(102836004)(59450400001)(6346003)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0902; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: 80sFcIIcHxmNf4XW0i1BYA+FlwZwAYYcPcqazGkSObPxwUoimT3k/2KRhNA5s1Vf4DblJKh86xePdKkA+aBnR73Sjz1aa/ZhME5FBlcM/8ajiDARH8cejQaaYoSmpUa1z7takMaTqBkLi6QFRvUFOcWEQ30HduNibbbOe7HqZKs= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c7d611b-d271-4eb5-584d-08d57f8a61e5 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:15.6169 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit 3312c951efaba55080958974047414576b9e5d63 ] When CONFIG_LBDAF is not set, sector_t is only 32-bits wide, which means we cannot have devices with more than 2TB, and the code that is trying to handle compatibility support for large devices in md version 0.90 is meaningless but also causes a compile-time warning: drivers/md/md.c: In function 'super_90_load': drivers/md/md.c:1029:19: warning: large integer implicitly truncated to unsigned type [-Woverflow] drivers/md/md.c: In function 'super_90_rdev_size_change': drivers/md/md.c:1323:17: warning: large integer implicitly truncated to unsigned type [-Woverflow] This adds a check for CONFIG_LBDAF to avoid even getting into this code path, and also adds an explicit cast to let the compiler know it doesn't have to warn about the truncation. Signed-off-by: Arnd Bergmann Signed-off-by: NeilBrown Signed-off-by: Sasha Levin --- drivers/md/md.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 1fdcd5735418..03bcc1ab2e9d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -1043,8 +1043,9 @@ static int super_90_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor * (not needed for Linear and RAID0 as metadata doesn't * record this size) */ - if (rdev->sectors >= (2ULL << 32) && sb->level >= 1) - rdev->sectors = (2ULL << 32) - 2; + if (IS_ENABLED(CONFIG_LBDAF) && (u64)rdev->sectors >= (2ULL << 32) && + sb->level >= 1) + rdev->sectors = (sector_t)(2ULL << 32) - 2; if (rdev->sectors < ((sector_t)sb->size) * 2 && sb->level >= 1) /* "this cannot possibly happen" ... */ @@ -1337,8 +1338,9 @@ super_90_rdev_size_change(struct md_rdev *rdev, sector_t num_sectors) /* Limit to 4TB as metadata cannot record more than that. * 4TB == 2^32 KB, or 2*2^32 sectors. */ - if (num_sectors >= (2ULL << 32) && rdev->mddev->level >= 1) - num_sectors = (2ULL << 32) - 2; + if (IS_ENABLED(CONFIG_LBDAF) && (u64)num_sectors >= (2ULL << 32) && + rdev->mddev->level >= 1) + num_sectors = (sector_t)(2ULL << 32) - 2; md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, rdev->sb_page); md_super_wait(rdev->mddev);