Message ID | 5735D7C2.4040404@virtuozzo.com |
---|---|
State | Accepted |
Series | "unix: Use helper to search for task" |
Commit | 8cbd93b4e5028e1af7a6ada52228f730f118e790 |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [173.194.203.109] by zdtm.openvz.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Fri, 13 May 2016 15:33:45 +0200 (CEST) Received: by 10.37.42.82 with SMTP id q79csp288208ybq; Fri, 13 May 2016 06:33:41 -0700 (PDT) X-Received: by 10.67.15.9 with SMTP id fk9mr22750671pad.77.1463146420942; Fri, 13 May 2016 06:33:40 -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 c140si24523047pfb.198.2016.05.13.06.33.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 May 2016 06:33:40 -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=fail (p=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 u4DDWwmm030498; Fri, 13 May 2016 06:32:58 -0700 Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1lrp0013.outbound.protection.outlook.com [213.199.154.13]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id u4DDWUCO030488 for <criu@openvz.org>; Fri, 13 May 2016 06:32:31 -0700 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from [10.30.16.225] (195.214.232.10) by VI1PR08MB0462.eurprd08.prod.outlook.com (10.162.16.144) with Microsoft SMTP Server (TLS) id 15.1.492.11; Fri, 13 May 2016 13:32:29 +0000 To: CRIU <criu@openvz.org> From: Pavel Emelyanov <xemul@virtuozzo.com> Message-ID: <5735D7C2.4040404@virtuozzo.com> Date: Fri, 13 May 2016 16:33:54 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.5.0 MIME-Version: 1.0 X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: HE1PR03CA0010.eurprd03.prod.outlook.com (10.163.170.148) To VI1PR08MB0462.eurprd08.prod.outlook.com (10.162.16.144) X-MS-Office365-Filtering-Correlation-Id: 7b8a15fd-31ab-45d2-87df-08d37b330869 X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0462; 2:blUx3DntA7mFFnFjBOWbJEWIOJgCYI3LRaH8A6hgxrfYSarJUWDu5Fa0BSM1EFYA66YFj1Hdt8EmaYP2nS26XBoKus3Ppmf7etQvPAH40LEkoWbLEf0k3bft3dB0+wQ8IH4qgTUjp+Wch5rcrXNgnFh+wDzVA0Rk512kFnitEaVPvUrfsGQAqTQC6Xq+XpxF; 3:b6zgs/51qTgNZaonklIuqPJzWlShxYKxtJ8kcXKbO+aQdrE95gLqaOZM84kGoyQiM0bu6t+PCnb2BOaHk162UaMbrzjfn2EPwysb/rALOmXwyXceKeW0gC+yRDt51j4C; 25:tXeRm/PgcEcnomKI7LKMkJExxWHEs5UlqbCvvrveCzDbGy8zTaV2G0/hLD2mcMXNwWygc+J91bDRGe8Wcye1E3PQISk9zEtRWE1g/Fm68RTsGGy0+uGHYHfhBAMFhoQEei6IYlhCqI60bdt+CTcHu/gqJDTEtUXjWtxZl1VWw2CaChI7/zLQJcYvofGA1JG4XwHBKS+5j1BKY7/tcwQOnF8oP9DOLdBqukouXky+RyuQxXDg7d+QhttUdmsdJRj7nRFj7A8EXoYOo/jQPrhd+deR2VB06fr4ukeIX+SiU0ER3OfYn+7pgrYC2+Sxpy/FFfZNW+HbaSXL7y4MgoesU38CjDnvdptfG3obljwnsZVcaa9+h42p0NvwDke8K49UhWt0loEGM7JmNh6F0rREnAKxRlC+kh7icVfD1EpDd8I= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR08MB0462; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524098)(601004)(2401047)(8121501046)(10201501046)(3002001); SRVR:VI1PR08MB0462; BCL:0; PCL:0; RULEID:; SRVR:VI1PR08MB0462; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0462; 4:WnVOACe8LcpLbQ501WR/KehatKzC1jsv/Vnb/O8BzlLuNPkcEMtLfn1XWfDjTBvScZ2oMxp96dDWr9VoRnBv+g4ZtClCc6C0wXhHW2+JW7J5PTsu9nCWeVZmiycSlu/vP5OimH9uayomL/RI23kHSKuzmr4U4q+Jjk4TDKuafu32jZbHwSWWeQxRABsQ/7gNRXNCB8eihBDjnk6Vr3O3COyqz4q6CLj+Fq5Zi21IANQjwoEZr4ae/VHhx0qcMUN7rf1AGxccw1an2K6yFIkuA74mldliTFbu6UZIGa4CjNtmQX0kq6B+GPPO76HpD5Zn8qBeRkMPwdGhW/h7n49sap37x2vDTWVH/4HzSFldw1508Hg/PSTzdNqG8k+4fgFE; 23:NOK5HXcEQ2RBV+3wI8R3e3pex1SU8bYGDbLGMrp5yRZ6o7f6RIaMeT7kI9OGJlICowZAuLwJJ7AVk7FQifJosKKCp/Am2fwfYONOjSQmhFyxvZgzkMOZmAERCwD5RUMvu9GMO7bcwnO0dYgV1WET0gwHd0K9ZbixGl+9Kl9LAlF2b4onHH3fw1TGf33vsXis; 5:k2PXxugqZCjBYnune/NMFl0f5a7HUsLU1gKicRFxDUFiftC/n9A76GU0mfR8Jejaxxwg6qRLuDwyQHBV9P5ggbogRYnBmvdE1XefHr3NPUBHqKYM2JUYLJKs4m+JBZDeelFb4P5Ur8bJyH1a8uEAxw==; 24:88W7yjdSZrSGVAEFuUalhcLIX6MQsk3BoVA57rpcirWi/GpBIxrtNfxPpZa3HHkqyeyaVkf2St+AtsyK984XxE/80hTb7Z49ni+KsZurC0o= X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR08MB0462; H:[10.30.16.225]; FPR:; SPF:None; LANG:en; SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB0462; 7:WsbD07F2H4LREfgQ8CcjW1D1jiEBJRCo5vAsFIYijHltEi69mdv6+lhaYaOeWnC1ANHZgkTekIJkqyuSbx3WTuam078X/WbMgi1xmg+4XfjIOHTn0cTenoAoqVKvq5D/5RzppX9/CYSyri19Qako8q5ghoEe0XQqMwpBHhfH+mXkzGktL1vKYe3k7XXgTEUg; 20:IAC+G8mT08rRO7UcjtZ6SWnJr7v8h0ByRulGQ8uYXxbpLsdT6QKIMSHU441q23lF09whXHigpOQD7g5HJ2qS84yDWAitLSSdeqkhEVnDF+VlKkh3Co4XYAvdp20Th7guBdtQo6UwTf9QKjVnG+fLIELmcwvwsjyObu12+9IpqEQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2016 13:32:29.9522 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB0462 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.10 X-MS-Exchange-CrossPremises-AuthSource: VI1PR08MB0462.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-Journaled-To-Recipients: log@swsoft.com X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR08MB0462.eurprd08.prod.outlook.com Subject: [CRIU] [PATCH] unix: Use helper to search for task 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/sk-unix.c b/criu/sk-unix.c index 1396d76..e18480d 100644 --- a/criu/sk-unix.c +++ b/criu/sk-unix.c @@ -186,10 +186,7 @@ static int resolve_rel_name(struct unix_sk_desc *sk, const struct fd_parms *p) int mntns_root, i; struct ns_id *ns; - for_each_pstree_item(task) { - if (task->pid.real == p->pid) - break; - } + task = pstree_item_by_real(p->pid); if (!task) { pr_err("Can't find task with pid %d\n", p->pid); return -ENOENT;
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com> --- criu/sk-unix.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)