Message ID | 149040825964.25341.853174238788685355.stgit@maxim-thinkpad |
---|---|
State | New |
Series | "fuse: add multi-threading support" |
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); Sat, 25 Mar 2017 03:20:06 +0100 (CET) Received: by 10.100.179.11 with SMTP id m11csp317452pjb; Fri, 24 Mar 2017 19:20:02 -0700 (PDT) X-Received: by 10.200.3.74 with SMTP id w10mr11940960qtg.73.1490408402321; Fri, 24 Mar 2017 19:20:02 -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 d43si3598014qtf.124.2017.03.24.19.19.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Mar 2017 19:20:02 -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 v2P2HvTi027319; Fri, 24 Mar 2017 19:17:57 -0700 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0241.outbound.protection.outlook.com [213.199.154.241]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v2P2Hu0Z027316 for <devel@openvz.org>; Fri, 24 Mar 2017 19:17:56 -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 DB6PR0801MB1846.eurprd08.prod.outlook.com (10.169.227.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Sat, 25 Mar 2017 02:17:53 +0000 From: Maxim Patlasov <mpatlasov@virtuozzo.com> To: <khorenko@virtuozzo.com> Date: Fri, 24 Mar 2017 19:17:42 -0700 Message-ID: <149040825964.25341.853174238788685355.stgit@maxim-thinkpad> In-Reply-To: <149040786394.25341.13166573577745027128.stgit@maxim-thinkpad> References: <149040786394.25341.13166573577745027128.stgit@maxim-thinkpad> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [162.246.95.100] X-ClientProxiedBy: MWHPR14CA0038.namprd14.prod.outlook.com (10.171.142.152) To DB6PR0801MB1846.eurprd08.prod.outlook.com (10.169.227.144) X-MS-Office365-Filtering-Correlation-Id: 24d192cd-e5bf-4660-7ebc-08d473252542 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DB6PR0801MB1846; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1846; 3:2MIxlLECRTzCIG3rfd7DqFvpx9tW/lI1CDxF0xYXzUFPs2IqeHnurY+hJUfSDwXwPjcqUUZ+g4q7oPCjK5ixJUnRFdftw2ZlaQ/YMqWmwh7BlrT76imC0bRHnGcwt6TSW50RXvzSaifb//xCvSmFNpCLRU0a3QtkXTaOQFdMjn1+A2s5vxF3xNJl94TuBSZXLnbvGExissw7fbt14vCsoJGD/l8pfHBYPBLSCcDKe9VURWDNFwhJADq/xVbWAatwaYdIsum3YbcEp1GKDbJ1Sw==; 25:n1rTInmeS/FIuVWX3nVzN0tLkCoIVMm+dv4PAAf8XC/mODwZphtUn0ivV1/pwkFHGwUizOO/JpgplA0N3m/FFywG6TazSA8tiAHqA8C0o/cPy2qVwz3GrZJQPtaRSm7jEcZKIM6z90aMx7mOAGjt2mFFt5x6Zajz2GESOwkQ055YA3j6Tfvdycl3eQKU+mc/+HOP/z4GV2nIvBMrajQgxXgoWHRpgy8mJZPf9MDz/sVVPUB2mb0Dy+ORgbiOslVX1sZa7ClZsiySq4d8qRl8vLjaJ90iH16yU7bT0EaPeQQnHD29/s9pc7KebM112rCGkQbsLz1NKk+rOu7Ri9NgBEPg70LGcXN2akKyhk/NUMDhektu27ac2+Dvm0lqX6Wf+54fd6jCzrTje+2SfFZFV8ku3j7Z5Gn0TuLi2wtFmuvOoYyZiF8gi+sR+3Oldp+LEGt8DWv8YdqNY4s5gdq4AQ== X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1846; 31:FNT0J7tiiIC2sBZl8mWA5d4CFrRlnlE56uIcN6qT1OpyTKYRtaUsU9Y+QN9yZqvQaZoWPekoBNy+FHvJGHIlvS1l72OXbKWd6+Y/E67UiEG8ztbRFkabwKux43vzUVzXaDTzwl8k07Y05NXiehYfXdgZwtzs/z2zPWfw2b+0XqW+SxR8R4keCfaxmnOB9HWlXO2izon+Zc+QlMzw/YEqPOcQS5CribjUE2c7XobuJrSltrZpn4HC9rIDhsRu4Tvk; 20:r6/RLjnL6UD4RQWHWnWhRL+nidTz+kSBSOWo8qUv4WnACcRQCrradi6n05xPWdjEpCjy4xraRBxxBjgvWqm+WLSnjMlQWYa+05yUXxrk89UFJnXhqXqbaTBA2v8a97hk0m2wBOxAb9+ijhdxMERsawMRs1EmqlelS4GoXEgQoH1MOifeqBSxxaFQJQ3h6VZjxwNVg2mTKAqmeS0QeIx8Y3RwVyEBtQCD/SrEkcX1+7pvUQcI07kGPCccOoGg9/upBobuo/6VmENU/qvCnfTM2aNqEq5cxDxjtrmLkOTH0G+eJ/Xkx41aqlaqTO/CF+YjqeQNLLYS2RnGvMhNIBHVM8kZDo8vi157sp+LuCWVovHjloHNLY09Y7csTy7BZcJ7iw5S96fDkuP2UmlvVAwD7p//fCAtRAv1XiJSDapftyY= X-Exchange-Antispam-Report-Test: UriScan:(146099531331640); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(601004)(2401047)(8121501046)(3002001)(10201501046); SRVR:DB6PR0801MB1846; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0801MB1846; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1846; 4:RX8kAclAWTyinYtLvgeqKrFt2VzivyquTf6NVV10s+iexdQ7zbZlPkyr4oqEsJ34uyvetv0u7k1Zd/g8zMKx1h+9FJ+eooodjeWgHHHr/m0kL0Lup3uGjXUpmQIYTOxO5WNyWJYHBEG1GcQcyo1aUt9UwU/gzpi4Fw1r0SQBNRKYs5CbHJhMyCtlShVmWNX56Zib1BijMJm3nP1eQbuSlwVWEYztE1eY6SYUC3ghOELoIFNn7wMolUDklqn9MZyx8ZRb480OGcVEePgOsQfsNKNvbflu3lK7qm1Rebip0tKeLdHPA/yCdvSYzXn7gYHEooeVV2FZ/YDk3odpUgjVULhjsslkFq+E7WdnuSQ/oZvhxusOxAWEh2gO4eVCmE7CEoXUSqnjEf3hVjyRFr8fTMalGHA9LwCFZKlosM7VpGEB6Jxii4Xu2fAUPhTLesxE; 23:A+I4VJrCu9VAfdZ8v+jWOPmp9AKp6ef8TE6MoAkjeonUbvkytq/L3NapyFWUgMXkgOgxMi1qstl/e9P5q58dqu9D+KNhYhB1zzWDRGwwOjZ5X84sStJnqloJG5IElQ0CYygMSZ/F3e9ICoB1uGYs8Q== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:DB6PR0801MB1846; H:[10.161.30.31]; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1846; 6:S88Lsxi09AA5XaDQK+8j2HJOgVDYL6ZeIpKRwfDHTzjO5h0i6pq47U/bnojrbOW4iPfW2g/LHtFHTUZyhXZJpCDRaWVUr4eFsFBO4qnPcdh5sqK43Poes9GGlmQfcI8MW3An9mq2NGcPMiHo6n9CxAFb8S+esrCIxH/XOc/uWePQ2BM/iihrTzirGGekCImPrALT6LD8Lky/Y0g9pf5VptYyQW2J2DbKCCklhpw44bVU2usCjATsvBOw3YER8BOZH+4GwXu5G1UY/QMFdniDP2KcMkFtPQl1w6dO6xHMkcgSgj6QEfsLICfZTAApWYYumGa0mhHxhgVCbtkjY6GOTMO0538hfax7h5dZk0FKn2cHP8lCCuMGx+5Ck21LGaOm4uddqQ+qQc6Wrjuu/hL/yw==; 5:nzszJgnEhGy2xXzpS67x9wbsq8506QZ/VYiII9WlxsyhJnlpoE/fHwGe72OyqIpHYlm1AQWRtNqXHQYyDeCWRHIr43UDwjIVK4jUZpa3UtKqjshQXYnGTeQM0UxTt8/xRMFe1p1WDeMoDGHrm1HMEQ==; 24:AhWBaRY2XMvzUNPjf9VUd07Tazq4QgEAleKqgJFmLHOr/SYK0AqsyzQGbXodscf9GZTv0xAmpxPWLtfkB6mnFIcDzEmHRXyqaOp6xWY9qdQ= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1846; 7:Ie/OWqTE43sHXwcNGF0MIvnos+JWHwTsDEUldrvuTzcjY1aI4GdJTFgs/CcRXC9Dhfwu+LfXKI74ydih+P/DBxDGndMLHcvs52VZ0bqY5qOfaxUnaC2oHWQuOUKT/j1h/k3zuOw2fnWk/4PqJM+N77K1GPQ8wiHr868kLEYSgjFlqSssf6zFTNg32nWUet5j8YWiTWBElV26sUxjpszIL70qG2SB0isbzKCUhYEmGSZsgJueDWK+jjEwqpo0jvt+QodcFYsEpwRIHfm3HaGm5M9inu+xVF+a+mTRz0smfqttslMFtPsnmiQfDpjpZGc02UBAle/MQHXV8A6w3iPcwg==; 20:qKNgp473T0tr0/tIaASmJYICZiAbPCgwFxQy9A+9BPtOFO8A+8S4rKHymF9aP9WGUkBdSOdFLTuNOy4wjaDdGXLMT1qqOM2s39Vn+8ddF2ap0n6aRa4FYTmikpqw/BM3LaaTy8z6nCwf03QU4CDAGkDVPgJaTrmG4vWl7cVPg4A= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2017 02:17:53.2183 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1846 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 162.246.95.100 X-MS-Exchange-CrossPremises-AuthSource: DB6PR0801MB1846.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: DB6PR0801MB1846.eurprd08.prod.outlook.com Cc: vzlin-dev@sw.ru, kuznet@virtuozzo.com, devel@openvz.org Subject: [Devel] [PATCH vz7 14/46] fuse: simplify unique ctr 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/fs/fuse/dev.c b/fs/fuse/dev.c index 0091d12..22e2547 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -302,12 +302,7 @@ static unsigned len_args(unsigned numargs, struct fuse_arg *args) static u64 fuse_get_unique(struct fuse_conn *fc) { - fc->reqctr++; - /* zero is special */ - if (fc->reqctr == 0) - fc->reqctr = 1; - - return fc->reqctr; + return ++fc->reqctr; } static void queue_request(struct fuse_conn *fc, struct fuse_req *req) diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index fbd6d38..bf7f411 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -725,7 +725,6 @@ void fuse_conn_init(struct fuse_conn *fc) fc->congestion_threshold = FUSE_DEFAULT_CONGESTION_THRESHOLD; fc->khctr = 0; fc->polled_files = RB_ROOT; - fc->reqctr = 0; fc->blocked = 0; fc->initialized = 0; fc->attr_version = 1;