Message ID | 149123646482.7426.16214009596409466069.stgit@maxim-thinkpad |
---|---|
State | New |
Series | "ploop: fix IS_PSTORAGE() macro" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.199.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Mon, 03 Apr 2017 18:33:29 +0200 (CEST) Received: by 10.100.179.5 with SMTP id m5csp147994pjb; Mon, 3 Apr 2017 09:33:28 -0700 (PDT) X-Received: by 10.55.203.142 with SMTP id u14mr6149267qkl.169.1491237208094; Mon, 03 Apr 2017 09:33:28 -0700 (PDT) Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [199.115.104.192]) by mx.google.com with ESMTPS id w124si9119274qka.67.2017.04.03.09.33.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 09:33:28 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 199.115.104.192 as permitted sender) client-ip=199.115.104.192; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 199.115.104.192 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v33GUh9j014211; Mon, 3 Apr 2017 09:30:51 -0700 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp0175.outbound.protection.outlook.com [213.199.180.175]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v33GLSGX014125 for <devel@openvz.org>; Mon, 3 Apr 2017 09:21:28 -0700 Authentication-Results: virtuozzo.com; dkim=none (message not signed) header.d=none;virtuozzo.com; dmarc=none action=none header.from=virtuozzo.com; Received: from [10.161.30.31] (162.246.95.100) by AM5PR0801MB1844.eurprd08.prod.outlook.com (10.169.247.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Mon, 3 Apr 2017 16:21:25 +0000 From: Maxim Patlasov <mpatlasov@virtuozzo.com> To: <khorenko@virtuozzo.com> Date: Mon, 3 Apr 2017 09:21:17 -0700 Message-ID: <149123646482.7426.16214009596409466069.stgit@maxim-thinkpad> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [162.246.95.100] X-ClientProxiedBy: DM5PR1101CA0003.namprd11.prod.outlook.com (10.174.246.13) To AM5PR0801MB1844.eurprd08.prod.outlook.com (10.169.247.149) X-MS-Office365-Filtering-Correlation-Id: e2ed26ff-9968-4e26-aa4f-08d47aad7a3f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:AM5PR0801MB1844; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1844; 3:tuFsLUat2a9OTPjWbJEqJEe64anyqztSwNVIzUrMCcQ4trXMZbrbHH4HUwNc1LAymvyscaf7MLSeQcqdwBnkhGe1DOiES5UXLDOdKSGoMpgHtG/JWM3QRJId/UdirX4AXIeBjcxUZZK3FouFsbWYV1PpzX2WrFY6g+3VLN0v6czV9tChAbMYexiKBRssnXOX1i5htXVrOKFve7vJyC7TrHEg6H9volXDyjXJw0naPOC+wLqmfV+yrjVrCPN3AIn8t1MEm2X+xeNBPzBF03zkxpzWKVGSqNnXXMddPnfy9nv1+yy42TyeNSRpPMmg7ZGQncd++9njHWtzCcrjNaiu+g==; 25:yxN6g8K5nvEM+1VjpRnnR9DmhX95L32krQeWnGpXKxr0uGCnB36FcjoZZtnlA7BaRd0mDVKmxKC/ADk+8wDGyw+JClfaXNvQXhnBMSfRhDmwIzGZhnAJmkkJGJiUEW8wb9AYRVnlUa8rfLlqEgd7dML6gJJ8eY5PeU589RERVBHJBGdlI9tjI5ThWAXWw4bolAyqc7DXZqWtZxVhlCQufsIUEAZxytmZRAxVvjBOxUSY0zeQBGrNafI/nBofPI8gnB0isOqBXLjaaxOpZ/sTzZzCmdGLH9pm291ZN2OHf8x3rVsQ0yDROJmXYczM4i5t7Pp8/DSCWaf/xzvpWaEV9MzJ0EDT2X6dI2nadG0pbEHQKJDt381liJDvVcgNefWpGPnQm0XK93hmv6GyMEcz8Gj2yhdmiD67QjntomsCRtkYOO113dheAqPPGzybf56bItyF81MyTba0LCvphEEk3Q== X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1844; 31:Rbg++jDXxD1pAspZ5x14jkb7zmp1p5RCcXG2j2Yn7UbM2YT1rU4uegfG4nSB4cqxOjAmWtNhe9AVIP1f8wRuc9vD2gvAEZM98pCxaE/L5e4o1h+15mKSXCdeMfxaTsGA9grlADQAnr9+XJr9eX1DPVHZ77w97u4VD7dAxjD4/J2V7FW0dKWdcxqN9Rb+28WrsDt5ctaUNG4/AD4zdIj3d6DKT0l8pgC82kwueyd+IyU=; 20:ddWdURLM3RsIo+rr6K95nfy1+I1DnNJfAhU6koVDp5nBxI5ebe4FQetNil/7xR06NGfaHMF7wHUnLh99gxC2hmL57REjIhhx+bTLb7UD7qoClDKOZVyhoCC9avPHzGUDb0n9P7Gxq2hroTOOIfXVLOZHJX9tu2q07dgJNAb4CU2xkd11ZjdAK9JBh3oNPFBPWI5+3SwsYWAtee6q4MAT/cnduXH5eHpuUNR+vk26FoZdzBuJNnbBAzVoJWlj1Xrp5S03bM6MFl+K7l4vuDlD56RSzrSWU9XZt9CCvUKdOxJJOXN+8Cpi8q1VmdVXVqnejR5oPTjv4rt6CD2q5U+bDH8opOAJ34tN066dKUMB5nQavYdQuk6wm+FejLPKpGP/8IpEuxh2RVDWXZ31HYdGPyIxudQf10/g04iPCaGwzWI= X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(601004)(2401047)(8121501046)(10201501046)(3002001)(93006095)(93001095); SRVR:AM5PR0801MB1844; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB1844; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1844; 4:SUesEeaLDpSpeATb/svYcQDfhodAxAFel/xkkiVIXgefo8Mb28rXxTNR6FtGf1X8zBTd3YhfgY/q5TInc3MpXp1B3h+v7QH/NCHO+NjK6XLQaqnTr+y4swtdHdOKKji0oF8AXhA0odU5cSla9V7/uLB2MJ9Qi6uJlly0erNNY816wOgucFTj73sthlQqPxmRxWTbZfgEf496bQhR+ieidOFFIvM1E5YVozlvd4vgzSnx0qt1DmX6xWbvnZCVymzXVj+riN8FSzljFb2rgfVyA+/BVpcgaMhJWUcdGMjN2fb0gQOTyQy4GfOxbM/xA4EYtQpkyK3UHpfizX1nu8MFM7Xx2/QX/dn+4uriqfD7MDIV77BbnabRbDvAUx28mPmB2mndGJAsnFRXkdyBiIiwDOYdQczQoyxlnDCaemz5G04gpI3DgxAVwjc5WTI3IMDU; 23:Bq9BghVmjR6NDu2JAPv5ZhidtfKPJ1SYHy/WMMfRRuYZWTjG1dIYCAaR1JD+5dmTBJFyRiDTtn5B7+y/xz0h4/8+g9nmGGZHFSCOzSrqYOZvop15VsoUsreJfkVKU4d+yvpfeIP2p6bME3jS6Q9qTg== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:AM5PR0801MB1844; H:[10.161.30.31]; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1844; 6:z4x6k0A4+P9QzpeWSWC7J2IwxyabqHAEE9ngnMLNQq897FBcnsEBaXTgJXfAOyL7OTCYJmnl1iQOY7lOaRz/+wsboBHtek2blcz6k4fPYeMj/uL44vj0pjAcxq648f6X0viljs877MxiF04QzFwEmVxs1ZP62CpbdSWt5SwMA+hvzPiFRDS958ehH1AXfSbc7Tpe/vk3SX9hdAqvfi8wnMwZ5za5j39hOGz7zmumiy8bN8tL+GtxOL+bOgYe9cPc1ABuGd3YDHey6rj8j+1QjVaqOMPM0UseCAkkpK4oKJNNkZT2CmW5fdX2tYHSOIzAsmITFRQuqd/t3HGnAN27NsRIsqZnOPflY5w6NdJ0IgYQfLLl8BEbth0hl3f4FEe9hK/PlKuOSWwN0IqMCBZDuQ==; 5:NmYanVPsBkqqE55LRpzVjYAHWj+wZT+kByJp1ulDg2OWmXkDWTKa7LSRkMlgHvQLsxlUTIUk3itZSMg4kGje+NCg9sEvPtzRMKl1jxslbc0UlXY8WHxgTJugHubLYEHGoFnyWZ+BMlbI9c9+/TOLUg==; 24:QZbd4BY7W6KGNlORw6jt+S+qcpej5bPRjDrRuEKHy9BS8uhlk1F6E3+vmODsAA7NBbi+MZgkks9tUuocAp12rgOWL8kxgPSTN+0kvljk+q0= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB1844; 7:zQJsaV7zAZF6U6OhJpnNCXQYRo46UOLmm9NsCuYuUVeRCbQ5bEHWlBOCSE1GuvFo7jqNjUu3PE6SZctKY1aglA/Y9uCSC8YVWt/OZeHE2nT1wnzku1k6sHStFdfh/H61giYWZw+VztDvAXpz8atSirxj6tH2YVwgaaYl0ZZJDJ80AkfDYatyksRayAHi3viVe+PbTScyBze0B9GEsKYk+9YHlqYOCvYaX4I5veEzu59mB98P/ZwmvZuLwGoTe0O6C7f/ciQJBOuqEJq+ikC0VJTd7qPvcdWSwVvTfG+gdpzAKy8vEeoqBjhPeifG+Gl9CtAj327sk+XvVNd2IS1HLw==; 20:am1kn4UrG6bowpP9CtFl7Ld9WsVvdYZDZl48qbZa+lgDPfc6kADRQMsoAeI90vn8AO8AClvNscpAuyaSM5xSusY8npwZAR5q9J2VHO9FO8VlNUQU00cyDgsdubAlhsuzjQe0u2VyUXyHPBkrxH29FNeoFE51+vEYps2TUpPiNT8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2017 16:21:25.4068 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1844 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 162.246.95.100 X-MS-Exchange-CrossPremises-AuthSource: AM5PR0801MB1844.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 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: AM5PR0801MB1844.eurprd08.prod.outlook.com Cc: vzlin-dev@sw.ru, kuznet@virtuozzo.com, devel@openvz.org Subject: [Devel] [PATCH vz7] ploop: fix IS_PSTORAGE() macro 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/block/ploop/dev.c b/drivers/block/ploop/dev.c index 09f5a41..e7aec54 100644 --- a/drivers/block/ploop/dev.c +++ b/drivers/block/ploop/dev.c @@ -3843,7 +3843,8 @@ static int ploop_truncate(struct ploop_device * plo, unsigned long arg) #define FUSE_SUPER_MAGIC 0x65735546 #define IS_PSTORAGE(sb) (sb->s_magic == FUSE_SUPER_MAGIC && \ - !strcmp(sb->s_subtype, "pstorage")) + (!strcmp(sb->s_subtype, "pstorage") || \ + !strcmp(sb->s_subtype, "vstorage"))) static int ploop_bd_full(struct backing_dev_info *bdi, long long nr, int root) {
"pstorage" was renamed to "vstorage" Signed-off-by: Maxim Patlasov <mpatlasov@virtuozzo.com> --- drivers/block/ploop/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)