Message ID | 20170321220101.21228-10-kir@openvz.org |
---|---|
State | New |
Series | "Spring '07 cleaning" |
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); Tue, 21 Mar 2017 23:18:54 +0100 (CET) Received: by 10.100.179.11 with SMTP id m11csp1956486pjb; Tue, 21 Mar 2017 15:18:49 -0700 (PDT) X-Received: by 10.237.32.70 with SMTP id 64mr16055432qta.146.1490134729566; Tue, 21 Mar 2017 15:18:49 -0700 (PDT) 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 m26si16825138qtb.280.2017.03.21.15.18.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 15:18:49 -0700 (PDT) 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=pass (p=NONE sp=NONE dis=NONE) header.from=openvz.org Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v2LMGNPq000350; Tue, 21 Mar 2017 15:18:35 -0700 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp0176.outbound.protection.outlook.com [213.199.180.176]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v2LM1aHa032560 for <criu@openvz.org>; Tue, 21 Mar 2017 15:01:40 -0700 Received: from HE1PR0802CA0008.eurprd08.prod.outlook.com (10.172.123.146) by HE1PR0802MB2361.eurprd08.prod.outlook.com (10.172.129.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Tue, 21 Mar 2017 22:01:37 +0000 Received: from DB5EUR01FT063.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e02::201) by HE1PR0802CA0008.outlook.office365.com (2603:10a6:3:bd::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.977.11 via Frontend Transport; Tue, 21 Mar 2017 22:01:37 +0000 Authentication-Results: spf=pass (sender IP is 195.22.104.170) smtp.mailfrom=openvz.org; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=openvz.org; Received-SPF: Pass (protection.outlook.com: domain of openvz.org designates 195.22.104.170 as permitted sender) receiver=protection.outlook.com; client-ip=195.22.104.170; helo=sacred.ru; Received: from sacred.ru (195.22.104.170) by DB5EUR01FT063.mail.protection.outlook.com (10.152.5.139) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Tue, 21 Mar 2017 22:01:36 +0000 Received: from kir-tpad.vz.com (customers.reallyfast.net [162.246.95.100] (may be forged)) (authenticated bits=0) by sacred.ru (8.13.8/8.13.8) with ESMTP id v2LM14vX001750 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 22 Mar 2017 01:01:28 +0300 From: Kir Kolyshkin <kir@openvz.org> To: <avagin@virtuozzo.com> Date: Tue, 21 Mar 2017 15:01:01 -0700 Message-ID: <20170321220101.21228-10-kir@openvz.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170321220101.21228-1-kir@openvz.org> References: <20170321220101.21228-1-kir@openvz.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-3.0 (sacred.ru [195.22.104.170]); Wed, 22 Mar 2017 01:01:29 +0300 (MSK) X-EOPAttributedMessage: 0 X-EOPTenantAttributedMessage: 0bc7f26d-0264-416e-a6fc-8352af79c58f:0 X-Forefront-Antispam-Report: CIP:195.22.104.170; IPV:NLI; CTRY:RU; EFV:NLI; SFV:NSPM; SFS:(979002)(6009001)(8156002)(2980300002)(438002)(199003)(189002)(9170700003)(6666003)(5660300001)(34003)(47776003)(2950100002)(1076002)(40036005)(36756003)(53936002)(54906002)(48376002)(81166006)(110136004)(50466002)(69596002)(42882006)(50226002)(104016004)(107886003)(305945005)(68736007)(6862004)(4326008)(1096003)(2351001)(33646002)(53416004)(5003940100001)(50986999)(21086003)(106466001)(356003)(189998001)(8676002)(76176999)(42866002)(969003)(989001)(999001)(1009001)(1019001); DIR:INB; SFP:; SCL:1; SRVR:HE1PR0802MB2361; H:sacred.ru; FPR:; SPF:SoftFail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR01FT063; 1:lBOe150AsZYrQq0fePbLr7sB5phwjcNHWHiwkRX7mlmqsJkU0mdKzw7ZCkr/vTrykWXsJDNE3oJsS/jj+E4pnZqYB5Jr324MqE1lA0Yy2DTKajMtDudHLRr+6ttEbN6Dz2mUto/nZlkeOImI7eKmxm+kGJiDGhItlGhdTThQS3XMrW31/KTrvV4kUCA5sbo9tkVvfOGFf670tGmSUkwZNA69jDvuYG4uqT5WHv0m0Y6YmdKR9laC+A8LB6qkTkKAS6F9AtMyGexdJl0d5jA9G0N0ZWF2EGbinZyw3vKv3d3NQjCtCKHm7obbeif6E5dq2dVCxxuEw7n9+ALNgWZTyn/HirZXsBQUjUHOexbtkroRFG8K9k7KRp0QOIVyQfggpenXVKKrItaYfQVxklcsI4nSafPOz6KTNEm91vllXdImf3iRkR5NDmzeWRdjkXVWPy5e2sfaDeiZWT2rD/iQ+2A6wvWuO3LOjSYqUbRa77MLgy1M68jo8cP+mxaCWnUsnQCmwIL8+TmKy3gFYQ2HB0luy5fDN8Zwq1ihNhSS2O9NEaazyPPo/U2mUEo7oz1BPakMlR8gdJzofjkp2xx8b0v36lbZrWO+nF72sCXyo3c= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: af86f429-8053-4d45-f12a-08d470a5d89b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(81800161)(8251501002)(3010002)(71702078); SRVR:HE1PR0802MB2361; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2361; 3:FeVb+d0k4e3FhC0wXCl+rTriZQjTfQG+pT1bzI3aDTLwodZMLFlv3SkArl2Gt9aAubnJ/WBj7zf57FJNRW9j1rfZ7e1L5ibqr1cgaDqzZybwXB4UTFNUjR2zTn1+Y3OF5PQE15C+uLtDQZru5TCZyLv6wi2FdnbW5hFKx09yoE/USa+nB20DhawFjV4eYn+chRFWBSGIfk4YinmaTVloZQy1PneWsIdoE/gHhuA2HipdNXS6OF7VW1bqTPIoLe8APPu4wtXsMD50dEVIW8d/gmv8MLhl2W3u5OG/hxf3+uhU/UoJpVT/tuwHRMQgfMJcwJVyevGqhOvf8ST6ke8DUTdjRIn2DcMdeGIICRzENQyFXwjFYX+o9HyWPs+0lW6wWzkfl735MrsCuMeXxhtYriQECKeyypYDjV9aR8iYMByRCNysPrwpBRH6P6+/iFMwJIaHS4ef3oMjONgJud9TWA== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2361; 25:ez4/I92GopeNHIuCdkjfxQXEckDpt4znYSCpWD+VKqnRMYraWXaPViHI48p8lnZ0jSF4B7W6GPA4ls3mW4gc2s/EO3l9S2oLCwE/HrRCEPRXHIEeccGhyhCUygdgpniP3ia5a3bSP0iYaOJzroRQHCRs8HiWcomh4B1UevX9pwib2bvgxNi6NIKEieYNTqgC/RAIaPB/5wA55bv+RTmjr0REMyZkrASwKFU5HjXeIcee3o/1jko+PcUALYBxngyD/XhKKbNvr/KadYExkA/26YVVc0NGAsjN4OyzE7CIQxJzUXTFS8BaGLlENIbTi93EbfqvEyJegF/2o6F6WR3hfS+8BBeGMC52QQwcQjfTeExulWn9og39cMXcqVPsE+8ozfCwGYBiDlJyXY/dF53G/7Nh/s5xEKpMsY6fTxsx0C93B0hsU03gA2QVxpIdzGfpeB/5gVn5ibICJxv5w5y1lw==; 31:30anWczsHZfA5eJe9IzsV+3EiWUD3EMeaP13NuTXrdi1IQvNZXwX5puV9yqKSQ+RBKpvos1bVRIF5KJ49cILSVb5LhBY+ZlOT9K4gsOv/pVcfhJvAuqj5w9xjx5MyuJmUH/muezfN0UyA/bhtTtQpSDHKZr9vOsi1iB3SoC6N7aV1wqRnMfMbwIkXHxCE9zJremhH0JGZxw5yELXPy6J7VUNbKh9RkoN5FAOQIApMqNEplyL6fDoRaVyDkA8GMHpRj+tAI+8Rz250WJPE7iDk6aN55AM1ELaRcXakixSkX7B/EcailahSSzg3RqA1Z4S X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2361; 20:LvJZ7lvLBVu2RaUsgUV8DelqySr71jgR/KToo/7fwMBKMUZt0A4A9z9qes/Eu/Xj2OD0O1BWuD4Qo1KqouiiprhSnT1Sic7pF7UTEa83rwUcYB0NFQPF90rciUgeXh4Ad7jmXvbDm9mGslRkZexcr1z93Xgk10s5b3/xq/igtbbrRRbRct4UUyiCZljJ/lyuPLLkqs+XGhrwjzWoOe6YTwUft83OLwZIlhlLO0ed4Xy7MlLJlPmTp4kGwalDLUR7sPQq76Ctqtt2R/Xr1lvGhuidLfzZ86V4K7fzs+T8qUocdJ3LfSpRtV93laLKHEFge8B42jTm6ipxF1uLw6mDf8iR0lJC4UIqBw+miUakYiYOrtI854enpSDUyDXafCbR8FsCUP+eJMWLVFCXCB4kAuIB2WDt3Tjq8+eG+4MOyws= X-Exchange-Antispam-Report-Test: UriScan:(50582790962513); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101523173)(601004)(2401047)(13016025)(9101519026)(8121501046)(9101504095)(13018025)(9101536074)(3002001)(10201501046); SRVR:HE1PR0802MB2361; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0802MB2361; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2361; 4:sxjl2RT88AV+U0ddAuBUymaevcDKvvWoAX9E6KzA4YOZ2wfEGhqZG+3NFGna8RugAjbpcUqgZLPTGLwTxsgUdoMfS7vzVIWJIbvAIdqKp99GoR+6Iwztita2Sjv+BX+PSLjYKSsMBCeTUOBVN/HavJWgLC7YZgGZj2ywzrGNyaISOvH4JAI99ssi14VHqzBIyNQePPT4gGVoSiXEs5/sy7ScTWkwhclMUbYT3ulI5eRSZxlCYI92zRY3SfBguqE9vsDEwWDp2YETaV0KWUjtSDbYuYfu5H6KllJW75PygqhcyHBMiwXuBWTc6beRhobwLnitY49ODWx6x17xk6nZQy59Tv4KOIChKtBKqRRcu8h1ly20YdOTGL/cNq01bF/ZCiEXAkZ0tAstk0l9iLqvN4AFrTQQS3VcE0FPd/TSSAEQtfRXpi6FH5FgCRCE8YdriarPYAUkGRMWioORxlErvvJ2OPCChfCvl8yWWbCsY3tjGcvhSl2r26Z05z5MPOn3QIfElAnULP9I7qpFtiRRpaVHPVWCEhve+Dxg66ej5Kk= X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0802MB2361; 23:v7Wajo6/7VdnrxIqJubkRSQvcGpA1UW/anj/9YI?= =?us-ascii?Q?MfrPMUKkLkkLFXSYeDyqZ5tx2eaRwc9svCAVPZ8m3JHVg9bhzT6fMs+Y2ZWa?= =?us-ascii?Q?X+/oqPbmKhn/9k4sIqhvqilPlJTHxXewsjZx8KOrOLz5LU0wOssVeddsLUiQ?= =?us-ascii?Q?YTxv6WNlErgKZYCGNvXDYWrCGRzU4TbEbQX25/96r9E0rhTAHk+/5LsvwDoJ?= =?us-ascii?Q?5GhPrdO3qNzmCIQwiCPFvmFWDDOHqx52mjI8jy+mpXFTYpXiasYeteQ5F4XH?= =?us-ascii?Q?vZBzMqok4zELp8XaEg46cGw9tskrQYxIEAh6EntAqPPZ8tHotDbwedfOjlZo?= =?us-ascii?Q?IyxrzpBN5Sgerzlm64zoyT5DtoKZZtEV90ch/RxB0mpb5khNj5t2iS737NLy?= =?us-ascii?Q?XClS8sr6jqkixly8ABYiug1E2V7AwtBWrRU/ixhwoLZRt04voCCxUgB7N8GO?= =?us-ascii?Q?TETETt0493kQy7ni2cg2gWieC7qyHupshpRg1w3w3O8kfdCoH85tnj4Db3ur?= =?us-ascii?Q?uLCrahq2S/wyO51beWJ+5GYFGH8zFUUlDjWrRCCJbaWzsrZXnO/vYwLxSDiX?= =?us-ascii?Q?X4ChLZIqsh4lZ2iRJGtTt4X2F9q5fymlPeB+UbVtwSCyUV/pAYm8Y3QO0jWq?= =?us-ascii?Q?MwPaz34SoVcouW+ZLsMCHsEY28mZ8W16ChFQ4KTFL9oTk2mdX80W/A2QJ7SE?= =?us-ascii?Q?M9JAxmu2NlrP0JSuCRe1jGifv8WujNtnhHiSbssdbAjquuxxmHZw6Fa75glu?= =?us-ascii?Q?yWiKK7rtITAdaykr/Tnz8pViSo2z2l9xytyb0dUflJjHMnDISsE0HSWLX1oh?= =?us-ascii?Q?2VmN2oKv3rM5ACZ2IoWqJInU6fpR5lz6itBFDDiummv8I4EBW1pk1S9TPCE9?= =?us-ascii?Q?U/Sc4Nr7w0O2H21eSOBxCwQfGBtXshMBIcSsD6/EJBEsdMV9RyvyhC3t8Z9w?= =?us-ascii?Q?VtetBFxg2uEtvXGFYTYrpIvfiHJBj1TmACIQHOMMiUtEeJoYJDU2nn7hD5PE?= =?us-ascii?Q?WZMdLa+GKWhli8jlAFCD7EPcwIIcMK9/4o7AmeDJDZKk1OlhUaVQbdTKUkBb?= =?us-ascii?Q?YylDhFhic6FmGM5b7rtECmb/lLWY06gRjXxLRp7VQDZ21yWae0WgCN38tWgp?= =?us-ascii?Q?Ngdf+imrGU9qgLGlw5THk+AvREHjtTUWD?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2361; 6:i22HfVcz287uzSyQMklKR5IzKvdm7kp/NHFaPj/v2qV1AHC6aNUqgZKdYh0aXt3cHoJZgCWW/g5kh8uD62tmxk308MmjjJlhN0bKcekkosCLSnnTrdxWhKlfySP+Es9AYbXehsWzUPD/rT+0EnjIWmxGftGJYIjO1ZE2VSqpG28Ow2wSwyZ6mNvA3Mg8CuTNkKsE84fQi9Hh8kCRr1g2HkeA1xzmepRulPqrw05/0XISZhuwxAiHZgMAePcGIF4LhYrDdNQc22nupjBHI4lZqwv9joob8QrYJqudPZZXhUQBXnDgujyA2ZIE5h6p+4xpD9gsa/IW/4X9SDVM44vgtVgh1Bn+XP//kNsXwLJ2AKrM8vD8RUqwQXWspabnwby5Bq7uVzuTsNrfbaSv++Nh6sqI7GC2vAu1HfUgTv3mvb0=; 5:fSKOQYzbIbLkzMT5ukE73HnKVvmYHVJwSEsJam7z8fRyPAqfATRrZktLxE3HDdG1ckuHTnLAeZGi6lGmPCGc9q/Cuet0Kq+SkttA7eUDLj4mbHpa0Va3It3Yg/8j5KZjJ3O2D+9LFxVUDNJ7TNPkhA==; 24:KOdIW2REolUsIPtaJw81OCQWpG9SDm2AOCMzP3F+MjuORijudCgcmfP+1Yi9KdWgfsHIGnN2kiUUIkgIM9x8C2FYRkL7c8eN6we7dVCycWI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0802MB2361; 7:vsmu91pmA/qA6cMXd/jAh6hNQe4rdvDKRSBrq7UWUO/01SOjU6QV/9XPV2Pofk3NQDdoPwGKRg7T1yU/oSD/Ik3jCa9x8Ifx/An+UIJPcZXxi3EivYkbXmcnyEdmbsr+EAeQ2IFktc9rWwyLcx0wGBNnPVHE8syb0dqHMzjNQ6OgtZPaceC+bJ5CEufUlXWoldZz8Yd9hTpDlG9X+p0FUzs5OTos3hNDQD+SQONsJiT2tkqOnmyZn7HrToo/wHeFnll5+DCasDEMUoIzxHe50zvTYW25+KIWqFsxN2wb2VOIyad628Ql0FGl0FgRZSsS8ScApHcdOl1TcctcqEoWSzlZGV8LYzyeEH/Q5miBMeNDy3jHG6MwiMs0uu3jkLnF; 20:tqQbt94Um6l6ujFRBgJdkq4XNfjaNFZiwwkfAKsTJtZQ70043TbM7Yi1FHdweqIBcl5zY5LRVO2WUGNIvDk2W9z0IHV5OhzFm7Zs6kRfSn9Cngx0NdscLiESpDzKdxrA/PJiEmKVTI2ldqqHwwqMGFMj8LY5N76a/owu1eZnUcQ= X-OriginatorOrg: openvz.org X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2017 22:01:36.6158 (UTC) X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2361 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.22.104.170 X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT063.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-SCL: 1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Incoming; SFV:NSPM; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR0802MB2361.eurprd08.prod.outlook.com Cc: criu@openvz.org Subject: [CRIU] [PATCH 09/14] criu/namespaces.c: correct pr_err vs pr_perror usage 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 48a79a5..80c0014 100644 --- a/criu/namespaces.c +++ b/criu/namespaces.c @@ -50,7 +50,7 @@ int check_namespace_opts(void) { errno = 22; if (join_ns_flags & opts.empty_ns) { - pr_perror("Conflict flags: -join-ns and -empty-ns"); + pr_err("Conflicting flags: --join-ns and --empty-ns\n"); return -1; } if (join_ns_flags & CLONE_NEWUSER) @@ -93,12 +93,13 @@ static int check_ns_file(char *ns_file) if (!check_int_str(ns_file)) { pid = atoi(ns_file); if (pid <= 0) { - pr_perror("Invalid join_ns pid %s", ns_file); + pr_err("Invalid join_ns pid %s\n", ns_file); return -1; } proc_dir = open_pid_proc(pid); if (proc_dir < 0) { - pr_perror("Invalid join_ns pid: /proc/%s not found", ns_file); + pr_err("Invalid join_ns pid: /proc/%s not found\n", + ns_file); return -1; } return 0; @@ -2356,7 +2357,7 @@ int __set_user_ns(struct ns_id *ns) fd = fdstore_get(ns->user.nsfd_id); if (fd < 0) { - pr_perror("Can't get ns fd"); + pr_err("Can't get ns fd\n"); return -1; } if (setns(fd, CLONE_NEWUSER) < 0) {
So, in places where we have errno available (and it makes sense to show it), we want to use pr_perror(). In places where errno is not set/used, use pr_err(). Cc: Dengguangxing <dengguangxing@huawei.com> Signed-off-by: Kir Kolyshkin <kir@openvz.org> --- criu/namespaces.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)