From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 94670803BB for ; Tue, 17 Nov 2026 13:27:27 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHDQBG4009584; Tue, 17 Nov 2026 16:26:12 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHDQBG4009584 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="X2qWTW+v" Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHDQARN009580 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 16:26:10 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHDQARN009580 Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-836caf085e0so54857717b3.1 for ; Tue, 17 Nov 2026 05:26:10 -0800 (PST) X-Gm-Message-State: APuU4Z9f84yFWqduXHccPVGcoPROzIPw2wy1mam9D6jewTgp6gi8jE8b F95vj98+2ebIHWM/GM5bxE89Pa6LfTXM1xwiJe1jONaX2lruEVpYrb6WooYGPnOZG78AEh4M7Ue WIlf35w76azl2bab+EBafIWdR0IxZ2cO0DsLCwhJW664phWPNrEF/7Q== X-Gm-Gg: AZFdTZdEk5mNdQOjM4KJAwCZrK8OYTaHTpuSaw6BjixxE1APdGDSm/zrF0kVoc8uH4k E+sIEWAkZkqIS02h7EGH7cevWH8WqzmltWzyGfOf50IdvR5mfSo2VY2jwFmLYNKWGJ5SnJfgtEB Gyw+lO4rmPnHRinkjQb58wjHjUYo4ZJAZ26v3MkaBV2JGZSv+QtLAZkePhm1F6d0rIjmhwMMVCc ZoRAz0GaiEIO/y1ZFCFGo1GBIyi0dnra6jqy8zHrD4eAbKOcMDrW5xzcXnoreB22WTDWDfUoL7R 9cmaGYwxEoYFeSpm7Q5kqvlyZ8gSaXQUGtRls9MKpyiK0g4Oz7EiHlO8aBMMMhaH/1w7DZRpdoW urFWVLKzbxuF05BlNvihoiHq1UcIPRoHWrnIut69WK9R+B6nfNKBQQRwmerv4HXu/fgAdto1SyZ Jbp03Kca+C/q67B0T1MQ== X-Received: by 2002:a05:690c:c687:20b0:8b4:ed0e:7b11 with SMTP id 00721157ae682-8b4ed0e8119mr12292127b3.4.1794921969367; Tue, 17 Nov 2026 05:26:09 -0800 (PST) X-Received: by 2002:a05:690c:c687:20b0:8b4:ed0e:7b11 with SMTP id 00721157ae682-8b4ed0e8119mr12292057b3.4.1794921968725; Tue, 17 Nov 2026 05:26:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1794921968; cv=pass; d=google.com; s=arc-20260327; b=bXLjyWxgkbiywDID7I5pmF4cFLEVxCgoxeJVTlcOOh+A7XTExNDQLENxNSAaHs0qRT VIXa49g+I9qkFsZRw4iAU5P+4WzPPkrL+4p4J7ryMW6CdSDpoDQZaGGrtjKAR1jX8K31 u86iaJpgOsaYrgCXFTH6hcCYfPsfw29paXMudWU+8/bb18PYTpFIGnlQGzsGx6vV9PNK AXP52KxrJtNp6XAEF+cNTmIFuq3GtxG/e85wuKTrmER3rFCeqC8Q5L1PrjXQcfhvqWlR tYYJAyUvK3G2zxba2HXwV7FVVZaMZoKLU4INr5meeZLq5mx8wnO7HANqGwuRnBhNoMuW Y2yQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-disposition:message-id:subject:to:from:date :dkim-signature; bh=xtHNvVdqJH2LdmPxBIsDfmFwI/tL7+Q7MoQR+S561Xk=; fh=DHZ2Y/hE6dhVx0UmP7zWEGZ5iFhKn/velJV5CC1BbgU=; b=pXgSNKbMMVsdnyP9wsMNfsz2fSeYkAX6wDISiEEfb28lof+1bgewRDfVav8bxYbrA5 HUlVbapuiUxzhnar9hXfg8Pf/jPUXZ2vGEtucug+CrDEsf1LFjcCRRYfnqsLiwxlJzSZ pXzGTVy4S5inKfOmVgrEpZG572hGaQTStIFkG8jp9UjsvmDrM8QWJqNPtjTOeSxZ8YkB ModDi+vmE15z1VuuF98X4uAIsy8aUKBnamrGoq4bCjco99ikFEnL1RGfhQa6zLok76ax TuY0aiyuTNbcQGKujgKN/GzMAcduxL8RgMVOh4JdgtAgWrKp4QX3zmcL49sfSHsnx+0J jBhg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=X2qWTW+v; arc=pass (i=1 spf=pass spfdomain=virtuozzo.com dkim=pass dkdomain=virtuozzo.com dmarc=pass fromdomain=virtuozzo.com); spf=pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c20f::7 as permitted sender) smtp.mailfrom=kuznet@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c20f::7]) by mx.google.com with ESMTPS id 00721157ae682-8b4ec53e769si14855277b3.201.2026.11.17.05.26.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 05:26:08 -0800 (PST) Received-SPF: pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c20f::7 as permitted sender) client-ip=2a01:111:f403:c20f::7; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=selector2 header.b=X2qWTW+v; arc=pass (i=1 spf=pass spfdomain=virtuozzo.com dkim=pass dkdomain=virtuozzo.com dmarc=pass fromdomain=virtuozzo.com); spf=pass (google.com: domain of kuznet@virtuozzo.com designates 2a01:111:f403:c20f::7 as permitted sender) smtp.mailfrom=kuznet@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bslFTh2P3sbPuewW90p0TD65jtkANtxulyA9DkYurmEu1VpahdX1iXd9ddurRj+RzTBjkyB5Mbk95ro9s/PuoPvI/h+E82DTE6PmHjhVBGkCpNijuFaFNQ70xjgEILl+z1L/Jj8ZIY9h1y5gbCqwe2CFZ+v1xSkor5sX42+IRwgkJDujop3PUDXfWLZgfZQHkx/cCm7jK/O9HWyWb6caWOXfFkTeerRdxcGM7nQyJPBU2bfRwzVf2YaTdyhIHGUEA3nKn9JYRqKKX9TYVeyn4AnGthdOqH2T9owBWns5oZhx5ZL7uGguGK4esKdmQyQOa1yDdWtpn+Ly6jnzoRkiLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xtHNvVdqJH2LdmPxBIsDfmFwI/tL7+Q7MoQR+S561Xk=; b=YHBQ0uUOKIls6811SPOcWkZBiOkPGochK4UOJ6DGRKUNOczVmausPXGyZJcGSV9u3yO58Zo2ssab6uc5VSH8dVt5XGScwKC47ut4OMOOEiu9It+z5ZY6XSPWXqmJaUPd+5+pXbMyaV9LvOIyr3O7lVg5UX7Qidm12Z6o8jzeiscRjz0J2Z7vRoCYKGsaT8jkQ7OvIOfgIhM5nYkw9iYDo6PxO1qKOE214aDZ+cAk1vbxjX36b67GWPOM2tDj6ALCCVpkOJxhUz4OW1wqT82mgzwo/yMbGGg6o7GZ/AytSR4PL5c/4hxjYxrin3zwIqR/7xlOT+jlXzjfFEI1nAyEhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xtHNvVdqJH2LdmPxBIsDfmFwI/tL7+Q7MoQR+S561Xk=; b=X2qWTW+v7k+99ED+2DNUF5lDxQsNTVb8HCN8G6nmxg5GWQZPc886M50QzAdrPed8DXx+lstOcU+R+t2JfC6LTP4TiETSg30q1BLozTHEpm6791vLguwpldNXpOl8Pt+9bzGgW32VXOn4g3ilacnKXNW2LKJTV/2GmPQd9Ub0TYRaD7DW3q9GzYD+gDfebBPI4we9mBweJQzmS8V+5ii7P8J1GKW7sGH0Wt3xbWqeofdo5fpzoNHAhXVKQ6PV4oFWu/AahJUA/EIvzrFk/oMaoZcZff5ecStoVfZtX2EcDmeZ+07WZfLkBCMlEs+Xfr/UCkVxn7lJqGnFzdnLh50qXg== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from DU0PR08MB8254.eurprd08.prod.outlook.com (2603:10a6:10:412::11) by AS4PR08MB7949.eurprd08.prod.outlook.com (2603:10a6:20b:575::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 13:26:04 +0000 Received: from DU0PR08MB8254.eurprd08.prod.outlook.com ([fe80::66a7:414d:72e6:4327]) by DU0PR08MB8254.eurprd08.prod.outlook.com ([fe80::66a7:414d:72e6:4327%6]) with mapi id 15.21.0615.009; Tue, 17 Nov 2026 13:26:04 +0000 Date: Tue, 17 Nov 2026 21:25:58 +0800 From: Alexey Kuznetsov To: devel@openvz.org, khorenko@virtuozzo.com, kui.liu@virtuozzo.com, azaitsev@virtuozzo.com Message-ID: Content-Disposition: inline X-ClientProxiedBy: SI2PR01CA0043.apcprd01.prod.exchangelabs.com (2603:1096:4:193::12) To DU0PR08MB8254.eurprd08.prod.outlook.com (2603:10a6:10:412::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR08MB8254:EE_|AS4PR08MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: a58e6378-c0bd-4b09-9fae-08df44ae546d X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|23010399003|261009223027099003|18002099003|3023799007|261026121527099003|261021123027099003|261021121427099003|261102123227099003|56012099006|10067099003; X-Microsoft-Antispam-Message-Info: UKJ6ST4ZU1jgc9j47tDdBOZIGsLcSyc0WnJT3EmeWqg35uqFNVBWgJmNpJmKF/qv+nQ4arl8bRpQvnkWSmQOML6ql1CiDY57+bYJIXi1JP8LnF3hltxdwXUxSaci0JwdyACeUIiOy4ii6I5/l04+D083t+5V+/4nKP6MkTdHzV2KzYXkdZvhQBYUYu+9GBaiEf3E/XPevQVoUfo66qGGUpm6SkMpAYqzMd6/MjP4Xa+Ny8dKXjfe/ObvCeFSGoBqO4lgFkfcYEj6Cf7hvVvCd2xksjRNY5TGFqbJg5qk1KOhDT7aSgm8QfaRfY8sG2/JrhTvP/G1sEhYdvlfISbwn6DITko8ddDlt5t+0drhOtqZlGhr4o6GCgKbWAF1EDSTAfsHqa87usBK5BCwrhVhE2hgcmdjrfelpIB9Z571vE6AKdNom7GOoUgFgVFP0A6Fqq5SFcokSjC518B/6H1y5KjQp9aSGhgQXEQ1WI2OGJnLC0cbYcUkOQapBLz6FbzYFQ92QFIoTjBPPpQgAqxv8D6rKzCWQWlbyim7nGBVOWMcs2vRK2kKwT/oOiyiMh9bltHY1u9Rvi0S8jQtyROSw7O19l2zYAaIXGtj/ak6zLYQqZ+UuayxhUaJ1L8DrdKzMvtSjcrm67XbqszTS2r/V4Mktk9tUxBzFlReIuwD5QM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR08MB8254.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(23010399003)(261009223027099003)(18002099003)(3023799007)(261026121527099003)(261021123027099003)(261021121427099003)(261102123227099003)(56012099006)(10067099003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EAz5dYoVAp6PCtWEGDB+qlskxtvPBY4zbyrsAC9zhDnW2goAVlq9borB9P05?= =?us-ascii?Q?/21u08L+LWRoIcXjVv4dFwdK00dQ8VhIY+/BpI2vkO82at+Juaz9u3omv3I0?= =?us-ascii?Q?HhUOu5HYVCX2O73PradlcTxe9KDCA+qBXfzo4fiBFr/Hg1p4K/PFFJ4KsLbh?= =?us-ascii?Q?8oWruKmOAA5K7OdrQUiLr3oaanr/WEB6H3qiF6freYuR/nEwQ6lNPBdiH0sa?= =?us-ascii?Q?Kg5lQrQrmtmN/0sotSCBMAk+6NBmQh6KTHyYFasTyJ6OhDjwGmJHVxkKqrC5?= =?us-ascii?Q?4fnl8M7LatK/BY2pLUQv047FLPbm2rRa1Z7FfBiJ4m5BR3XHdQKWr1i1h0rx?= =?us-ascii?Q?uINe9WVGNU4fsHjwgg0N1cSESMWbWQNAw6CdalWJn41tz9ySOwgRfGp4Wtg2?= =?us-ascii?Q?+gsRA2IQVyoZTD51XqBMBbHpKfJJmyd4facO4kUHhHJdIP08PWuFbj8quG4A?= =?us-ascii?Q?Te0JxIu8/ppApswMWTEYKcJ4Ygry56sCmwpcskO1iNckLrfrLvvDkQ0gjIz3?= =?us-ascii?Q?8kYLIciPUVigR2VS42KcF7EEBvSddJom3yMPD0sU2gb6HT7GfWKjaADMd2MY?= =?us-ascii?Q?JXbQJKTp3Z1M1MdJwQdyoqeDnwKD9BoyitZfA684YTnQIhxqft1JJ+OzaXKm?= =?us-ascii?Q?BKP/2UJLCBQ+51qPA5XDsMS3Tj8+EXJfa5HvFjWldZ9EhjNcldMOnvup1OEG?= =?us-ascii?Q?8CWR/SE8gPnJg1HRJRcvcdWI4DTxVMOozbPlRQigAFK24JLg19gS3DZI0ovI?= =?us-ascii?Q?bIrDwXOp7MzO6okMTnkYkFWnFvWjSJCHGmkKijFUyLqtK+TVdVJuH4dPuL8F?= =?us-ascii?Q?PaEfC7miR/VG/kvARvG7cDjU09984yqdNsajRomz4ym2aWLIshEVeiqF3OUF?= =?us-ascii?Q?PDvkTAHCqN/BJ0i748+D+nspYbIc06n0+MSrTtlcrehnFs+FdvNM8cSpc0Ra?= =?us-ascii?Q?WZymccnCzRWJVDHQhFzK50oY6lOJMppuG9yB0rBjCJ2rsSqyupUd9evOwmtR?= =?us-ascii?Q?Y/kr5xnMy9CHqlM2H81BU9fQ6TAVtZ7J3NNzSuqxLxdjsrskOuV4oS4Y6wdP?= =?us-ascii?Q?s0Porw1Dr4DhAt6g6HL6usvz+m6fPqsMTHE7Xp0Do7J/8tR8rLJNz9YpSiNF?= =?us-ascii?Q?7IrIWep39JqdicV8wwLzMxOuWMRXlQBT7c3Id4BiTkw7xpd6Chi+7cd9Osm2?= =?us-ascii?Q?nTneXNSALvznliRYsBp7MHAyouFFbqKPZ27m5BxEqJPKPV3u46zE040MoBER?= =?us-ascii?Q?Qddk4ttOyihSYkKZWburOJ+OmVmh1Zdw6GrdbH+Vabu8Px6G/IoVIGAFj+cT?= =?us-ascii?Q?vhDfySxK9trVjzFP2PW5aN4k64bKd0hTbnCHc07aF6vBB/LjL2YTfegWk8G7?= =?us-ascii?Q?co2mO7ThAVYDxJNzjnElGgbaNa61Daha12UgFOwiXHZ3epgMmSsOE0WGJVy/?= =?us-ascii?Q?J1yJpyz3+UHsSnJxqD07oMPW62j0upDfZCbxLYPmGkCCPld7DCuzwafYkRzD?= =?us-ascii?Q?ZvldmnQQD9W/IYEoldqnytwWNUw310B3iB7iGOvwFqjNz7M7hCWdqT3bThwY?= =?us-ascii?Q?i9Svd7l4vblyxoOoGYIdivNjOq4czYHJn5fuNGVi/TlMPw9p3RzZbYbzUebS?= =?us-ascii?Q?lROxgk44RCZ5lDyqKt7oF/erqVPJBYy/LueAgwvi5M5wXmT1UAnN+KeRGunr?= =?us-ascii?Q?t012Uk2YkHaEKuGNNxCOpMl5BRl8vzBQQWG151KKJcG7shGBTTja7FtyOfEN?= =?us-ascii?Q?UEFOsUqeSA=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a58e6378-c0bd-4b09-9fae-08df44ae546d X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB8254.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 13:26:04.2276 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: p9zyrbYkueV9rDb+uN7DrnLXIvXKMhJnlVrJpuQ1l0Vi8WvTSKdETnkLy09A2Y4+5tgmIisiiwNbZyUThrVYpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB7949 X-OZ-Fwd: true Subject: [Devel] [PATCH hci-8.1] fs/fuse/pcs: fix problems in logging X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org These fixes were done in user space long ago, but we forgot to do them in kernel: print correctly formatted client ID and show correct origin of error. Affects: #ASUP-3693 Signed-off-by: Alexey Kuznetsov --- fs/fuse/kio/pcs/fuse_stat.c | 4 ++-- fs/fuse/kio/pcs/pcs_cs.c | 6 ++++-- fs/fuse/kio/pcs/pcs_prot_types.h | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fs/fuse/kio/pcs/fuse_stat.c b/fs/fuse/kio/pcs/fuse_stat.c index 41bb9c71af90..9b5825b0bf8b 100644 --- a/fs/fuse/kio/pcs/fuse_stat.c +++ b/fs/fuse/kio/pcs/fuse_stat.c @@ -370,8 +370,8 @@ static int do_show_cs_stats(struct pcs_cs *cs, void *ctx) } } while (read_seqretry(&cs->stat.seqlock, seq)); - seq_printf(m, "%-10llu %d=%-8s %-10llu %-10llu %-11llu", - NODE_ARGS(cs->id), rpc_state, pcs_rpc_state_name(rpc_state), + seq_printf(m, "%-10lu %d=%-8s %-10llu %-10llu %-11llu", + (unsigned long)(cs->id.val), rpc_state, pcs_rpc_state_name(rpc_state), read_ops_rate.rate / STAT_TIMER_PERIOD, write_ops_rate.rate / STAT_TIMER_PERIOD, sync_ops_rate.rate / STAT_TIMER_PERIOD); diff --git a/fs/fuse/kio/pcs/pcs_cs.c b/fs/fuse/kio/pcs/pcs_cs.c index 85e5af2d28c1..d94ac7dc73b2 100644 --- a/fs/fuse/kio/pcs/pcs_cs.c +++ b/fs/fuse/kio/pcs/pcs_cs.c @@ -380,10 +380,12 @@ static void cs_response_done(struct pcs_msg *msg) pcs_map_verify_sync_state(ireq->dentry, ireq, msg); } else { - FUSE_KDEBUG(ireq->cc->fc, XID_FMT " IO error %d %lu, ireq:%px : %llu:%u+%u", + FUSE_KDEBUG(ireq->cc->fc, XID_FMT " IO error %d %lu/%lu " CUID_FMT ": %llu:%u+%u", XID_ARGS(ireq->iochunk.ir.hbuf.hdr.xid), msg->error.value, msg->error.remote ? (unsigned long)msg->error.offender.val : 0UL, - ireq, (unsigned long long)ireq->iochunk.chunk, + msg->rpc ? (unsigned long)msg->rpc->peer_id.val : 0, + CUID_ARGS(ireq->iochunk.ir.hbuf.uid), + (unsigned long long)ireq->iochunk.chunk, (unsigned)ireq->iochunk.offset, (unsigned)ireq->iochunk.size); } diff --git a/fs/fuse/kio/pcs/pcs_prot_types.h b/fs/fuse/kio/pcs/pcs_prot_types.h index 64718d568b3e..0793391b9964 100644 --- a/fs/fuse/kio/pcs/pcs_prot_types.h +++ b/fs/fuse/kio/pcs/pcs_prot_types.h @@ -453,7 +453,7 @@ enum #define VER_FMT "%u:%u:%u:%u:%llu" #define VER_ARGS(v) (v).master, (v).cluster, (v).file, (v).lost_lease, (unsigned long long)(v).chunk -#define XID_FMT "[%u.%llu:%llu]" +#define XID_FMT "[%u." NODE_FMT ":%llu]" #define XID_ARGS(x) (unsigned)(((x).origin.val & PCS_NODE_TYPE_MASK) >> PCS_NODE_TYPE_SHIFT), \ NODE_ARGS((x).origin), (unsigned long long)((x).val) @@ -463,8 +463,9 @@ enum *((unsigned int*)&((x).uuid[4])), \ *((unsigned int*)&((x).uuid[0])) -#define NODE_FMT "%llu" -#define NODE_ARGS(id) (unsigned long long)((id).val) +#define NODE_FMT "%s%llu" +#define NODE_ARGS(id) (((id).val & PCS_NODE_ALT_MASK) ? "K" : ""), \ + ((unsigned long long)((id).val) & ~PCS_NODE_ALT_MASK) #define PEER_FMT "%s#" NODE_FMT #define PEER_ARGS(r) pcs_role_to_str((r)->peer_role), NODE_ARGS((r)->peer_id) -- 2.47.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel