Message ID | 148403621841.3625.7415614210319971858.stgit@localhost.localdomain |
---|---|
State | Superseded |
Series | "ns: Fix error return value in __get_ns_id()" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.199.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Tue, 10 Jan 2017 09:21:10 +0100 (CET) Received: by 10.37.248.19 with SMTP id u19csp73035ybd; Tue, 10 Jan 2017 00:21:04 -0800 (PST) X-Received: by 10.55.12.14 with SMTP id 14mr1599099qkm.308.1484036464594; Tue, 10 Jan 2017 00:21:04 -0800 (PST) Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [199.115.104.192]) by mx.google.com with ESMTPS id 31si838511qts.115.2017.01.10.00.21.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jan 2017 00:21:04 -0800 (PST) Received-SPF: pass (google.com: domain of criu-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 criu-bounces@openvz.org designates 199.115.104.192 as permitted sender) smtp.mailfrom=criu-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 v0A8HpnZ003148; Tue, 10 Jan 2017 00:20:27 -0800 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp0145.outbound.protection.outlook.com [213.199.180.145]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v0A8HnBR003145 for <criu@openvz.org>; Tue, 10 Jan 2017 00:17:49 -0800 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from localhost.localdomain (195.214.232.6) by AM4PR0802MB2274.eurprd08.prod.outlook.com (10.172.218.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.829.7; Tue, 10 Jan 2017 08:17:45 +0000 From: Kirill Tkhai <ktkhai@virtuozzo.com> To: <criu@openvz.org>, <ktkhai@virtuozzo.com>, <xemul@virtuozzo.com> Date: Tue, 10 Jan 2017 11:17:42 +0300 Message-ID: <148403621841.3625.7415614210319971858.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR03CA0026.eurprd03.prod.outlook.com (10.163.170.164) To AM4PR0802MB2274.eurprd08.prod.outlook.com (10.172.218.7) X-MS-Office365-Filtering-Correlation-Id: 8119ff88-fdfa-403e-36f2-08d439312891 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:AM4PR0802MB2274; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2274; 3:G82ExKylMNvYhoKL6mZga+7eZIv0GDSZUiTx2+1lTwjANTc1eLQqkRMvynu90AkolhmFXTlTigCnMoGur0B8y/OUS+Nf6apO8etZpDCKMgQkUMcbn5eiWonYnO/nFSyC01B0WqYRCGEp6FiWzh+IEnvRzM06SwfOMJDAm9EH7byyDCvtNZVgfNVB8tKV+BL/Et1IxjKFf8wG5XbGPxRhzrw9fJ5yfIbNLaEW86EvP4xjedfqTmK0iDRuMYAXgDkn0N1N9yvHVEOCgZ+17CieKA==; 25:ldT0wfHsSd2rlrLyqELdUFK96uX0eA8STfbgURrFqjgOBGJwW8mEivytx3U1wv7rOk9XR3rw0ohIUvNcQUNn98ALXQPUSdYvPfzxjwdpWy6ev5MTTZXeXD5jOaYj9vUYQfAysi2IlLfhbfXC0QplaJfElKHKg/fkacPZeqkLsSsTLtRDypXeWZEYrzv0f8bIqS4otMdvRZiyJCSzf2jE75NSQ1qi2+VIhIaFL6zd8CBeMCszNFqLl6MHBgcqSTZZif/qNyZ+Z7tE1cCRwAye1U5kLh8kmvqqQmWk3vIzMmNJ7e/GFmx5U/yjmHNMxw5YWrk/0fPIdw8aevhpeg1yEJ2icTmLXWms0GZr8F/yh8XAIqpnSSb5MFTPYiq7+n0o+JRsdvPzbVbaB5nvBQ2PNwNk7kaY8x/hF5qtA8bjV18PBdUrxeStsyIftJRYtSIarkWvp+Tp2rCPpYN9I/W1nQ== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2274; 31:y1y4C3JsiJcxApYSIhKk9Be39e4D5gcqJPrvJgNGp4hn8zS9G2gVze9HKMw94wGVZKNbmUppzwXNb6565JEho8ZImyupf0wZeka4XJzGIXGEKJub2WRSe4TFM+VeKWUZ5hlEQeMIHPYi4rWraanXZO4WiUGmplANWasgaEnitKbmLClcWOMIWTAuR0HjpkALQ1T9kUXlWic6uHVaCgLQqFUOLbV1rbm6FKpFVCwM3nUVY1HpjDV8ryRFW9c0mVpu6FxZXpKGDDH0p4zZcFZZ0VCUpWiw6+ASyCF28E+Tt6mjYMI9H7gr+I5+4/jOm+vr; 20:ci/o9jU7A6U1YMJ3VXKWQM1bOcpsNOA5GUdMB85i4eU2zc9MoruobAMRBnjIRpJhNhh59x64zMEomdXLtZBhe4c0U+EM2k1JQyULTuXCw2nyecnfJGw+mpb61giKyEoeG4GvrAhSJfANscmf51tkB2+VdWIhazsG2+CJwKK0Iq5BoAQfJyyT3SpuRpFKnFQZvL1XQLU/5NRQMtJGkuk7CzeyZiiqcA4wLElixGbvS2iEVD5HoOMrHyQVeviGBzim X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524098)(601004)(2401047)(8121501046)(3002001)(10201501046); SRVR:AM4PR0802MB2274; BCL:0; PCL:0; RULEID:; SRVR:AM4PR0802MB2274; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2274; 4:SrOAbo4n7KRI6uUCof6f7G+xDT/tDPQplTsDY7pCF++WZe0diGU/vDGdDqgmuJNtkSzPXGq7ZPrTzW2oL7lvUyrMHkvDdmWgRCnJf3WgdefUx8FdEv+F0Kb+zT/3MXElJaqJGnOrj9J3HNjfT+YmZjLtA2ebAXjgc5njsftc7BiGJtHqAsrjV+gsce5kFO7UpdA7jBz9gqfM17xUom9KpILjGfS3WLz5v8uOH6Od3O8xZFj20IaU+I18y3m8I1ZpLADt+0RMSwrbUZ5Z2r4WZHnQWvhCslzTW3lStlufL48BRMDFRqsmIZkYKk9sOWOLquZzhXs2GhukHE7NvfJiJzqzuBQKWrKnIBkKm1mXQ54skOVZF1QVM+/isNCy5BQvulDz3RHvOv83DCjoWpMyZg==; 23:3RXHeVlRd2Rmu/ekopTfeeUU/dzusg4f4EiZm2qx1QIxv05xQ8rR9SBnJe2TCHsabQBqLMieWXlpnLAs+yJ0ZqpImVgZoiRBMdJRLvlbPOVKLTdp8QtQ7OUgGEqMb6Pvq7z2zlGgRPuq8b+V8ZbzKg== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:AM4PR0802MB2274; H:localhost.localdomain; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2274; 6:VWk+xpXApPxZKWQNDqKIEuUD++srsuBVZVsNsLNxyYXseZRoSCuSecpihqdx4TPB/gP0cqSOgP7E75kI2OLckRaOov0s/tn1Zr2ds49K3Y3O8xxPN34NoDxRbSvUpBbacZJsFfuBDfDx0HMPdGRdbGWG2tDWuaxGBqGI5utf16+WkbSbkYGNnoalFSefLPDPOBHymh+umT4/VA20Rn2Tq0w360ftCiyS0lbq768unqAkxE0N644oCcMqVh+wCbjQQn+yHcceWf+PRXQNglosVaPekgOxtIGLBpaQZpEEvfu47pI5WTJ3vOlWoEWoKzJUhxZWZzcO60OBeBqKHCGSIpWhi5Pr7cgSsYn/10EcwvWsxOnjMijtm2iRLU9pn/8VfD6Dd6smXI3vVhHguRlbGyCxs5RhGZWD8GlWsJ8xQoY=; 5:QRqD2KoPPdtwkupVhVKKKygYuGWFz6YflY5X0d36IwcOeY1jzM4KNCfWPs1j3fD2oMw3KyiUnB6qQQ6nDPPLoFDhhKu4e9W2ZDMT2vmiAre12yAtw9whcwpBEwspRQw3DSjiMgLqoV5h0GD4Vc1gnA==; 24:sEuYQDr0W4Zb/nUWwF0o0DpQMJeveQts9/hCiileIUXhmPcq4vyN5Wm6UZBqBUPhjlLDHmWtKTeUOlur+AEUo9NECRuyqyWSbHoteiBkI0Y= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2274; 7:n4J/2eSfKon2rxQ62MGYtusBK7Nq6VjVSR7TFejxEI3IA7xSP4JaqvpC982xVLUNhoPxplZbWUjD/YSgdk00WTImSJX6/LVlHQi2Ex/E4R2whten33fcQvVaAy51GYOfvtNHs0pCZgwQfh5oLIrtJX5MJD3stQu687pCMZLVXg9y04XY5r1Z588FFBgo9Ti0OLuKA6bDxqfjvHP5XkN6n8NrYABJKVnH0rX0nxvuRxFe4/ZU+D6NRFiDyfFePITEAMJZ6Ru+DzRxCItTnuPqUiQVv0lG5YE7lZObXYE46TcrOFfvAxpWROL32khqj5Q1twMpMfjIAhVSXkuIlJydT2DrgLA4Nkv1VnHtfakO3/T8p3F78uok6IKk6O+9JvdD+PqnmuAiq7qR6W92aY0OH8tJiBTWqr4IEp6h7Ji2e+6OeAEl7ueS0g9d32CAId6gobHSqgKflWQTDYPTyfM2iw==; 20:wii+WRtKJAJbCQJ7hUmD3VW4j4JgPWH8fKJoswo5or5cC0Hh6VpDedZEvbnIAQPPUaYkq6A6RSPUxdDi7c3T33J/zxPSfwvYrbWwZdXYUQ6ZMY29WsNuVdWZI5f5gluB8Yt2fbRoFe7M9m+gx4RwM2kMd+XHqKhlLkUJZp3Os/E= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2017 08:17:45.9946 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0802MB2274 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: AM4PR0802MB2274.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: AM4PR0802MB2274.eurprd08.prod.outlook.com Subject: [CRIU] [PATCH] ns: Fix error return value in __get_ns_id() X-BeenThere: criu@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: CRIU development <criu.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/criu>, <mailto:criu-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/criu/> List-Post: <mailto:criu@openvz.org> List-Help: <mailto:criu-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/criu>, <mailto:criu-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: criu-bounces@openvz.org Errors-To: criu-bounces@openvz.org |
diff --git a/criu/namespaces.c b/criu/namespaces.c index c09c60bc4..b954f9796 100644 --- a/criu/namespaces.c +++ b/criu/namespaces.c @@ -449,7 +449,7 @@ static unsigned int __get_ns_id(int pid, struct ns_desc *nd, protobuf_c_boolean goto out; } pr_perror("Unable to stat %s", ns_path); - return -1; + return 0; } kid = st.st_ino; BUG_ON(!kid);
Applied
Function has unsigned int return value, and error is coded by 0, not -1. Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- criu/namespaces.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)