From patchwork Tue Jun 6 23:58:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovskiy X-Patchwork-Id: 9770231 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BA8DD6020F for ; Tue, 6 Jun 2017 23:59:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87DBF28329 for ; Tue, 6 Jun 2017 23:59:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79D76284BE; Tue, 6 Jun 2017 23:59:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7CC728329 for ; Tue, 6 Jun 2017 23:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751419AbdFFX7H (ORCPT ); Tue, 6 Jun 2017 19:59:07 -0400 Received: from mail-cys01nam02on0128.outbound.protection.outlook.com ([104.47.37.128]:53771 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750766AbdFFX7G (ORCPT ); Tue, 6 Jun 2017 19:59:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=NwfESXPT3mThgzbJ7Hxk8FEWIt87DDGypa8GHnUVsbM=; b=Z4i8WtRaPUPeptgPkj0ZlPGiVxeKd8lAZkA6vDN+JRCkjM0KYRV7KW3G7sQtFFpW9TorZ+aIYj15rP57aKhHZJppUX5z+OjzB6hwkX2r+ReJROZ3VxHcRmdLXlBeGgeFR/cosMDABuXNlDFNSrZQCULwKfnAHM0NG6+Yrfzpkvs= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=microsoft.com; Received: from ubuntu-vm.corp.microsoft.com (2001:4898:80e8:f::63b) by SN2PR03MB2349.namprd03.prod.outlook.com (10.166.210.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1157.12; Tue, 6 Jun 2017 23:59:04 +0000 From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Cc: Steve French Subject: [PATCH] CIFS: Improve readdir verbosity Date: Tue, 6 Jun 2017 16:58:58 -0700 Message-Id: <1496793538-3018-1-git-send-email-pshilov@microsoft.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:f::63b] X-ClientProxiedBy: MWHPR01CA0038.prod.exchangelabs.com (10.172.172.152) To SN2PR03MB2349.namprd03.prod.outlook.com (10.166.210.140) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN2PR03MB2349: X-MS-Office365-Filtering-Correlation-Id: c78c70b2-988c-48b9-ee67-08d4ad3802da X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:SN2PR03MB2349; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2349; 3:FT5jja8RSvAmjlB8HKztHYHSzmWk0SvE3ywIL5UY0W9/WjF5h43Txi0hYnd6VikhwC3OgWHnIV/5DemLn1dI2Zxibu6t2ZhnRphiqXSI/CgBALLm0qYDFbcI66oKfhi36y/If10mXez5+18TnMOv663UoJR4guYLAG0dRmBySYd5cUGg6AQ5iSqbsd1k6H32cdKg5yoBUXO3p4cbIV0UPjn9/Y20PKaNcoDo30DkeptGm3ReuuPbtqZwMdbvopHpINeDvinezd/GvczVljjrbipiSh9zJVikz7Fsa2IeXSdJvRu02XIsVRntQHCY9PE6LH9XPhpzh3kjJSkFLiXVnaXOCi/0OZUlkAlEZioI7Rk=; 25:+9DFDKtbpukjBIzoFML6lxUFtfw70nUa1OdwqzyQFpsT9vaVRSuI/kzKQBqhHQDHLLlBMetIMX3CXFmP+qYh5msIz2yemHR0mA5sFBO/KIozORjt2KZkdG9hvonNbwHe8hKIdtzrimgD1/AoBVYT4QbfJ1/i/U/tgCTxV8LCiiiLfGzrCNQ4onyz1xjy9nW6y5CzPner9Oa45DNwFdFAt33x7l5Nkw+10hL3dT4gFzeX3b2D/3Cvho3MJ0iqtvIOEp0k/yLnmoA1W6ihUqEHcDkp2dq4q3+6ZOqvw8YtOV9DoteBBTfxfH6SW4rc4WLUHOe+yubDN6aAZZ/V2nEbMO8GYJSOV9hsWat3SQRtKnsIqXJUDnY8n3vGIQhcm3wkvlrzoeDh5XzlqdaqAGYXZZ/8LG3yzB+KNb88S6a3KBU2NUc3SQTL3Y3c4Mv2sPX6UQO+W0eFvuk47S655gM8gsXIwOjgDT4CH8huz4Gr0TE= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2349; 31:DjsAWtAsHsqpEfEG3L60vRvpEPuCWU+vJzpCpFykm2EE1xx6pEziumoGqn+amJVrOiRidpNp/1eWjPwPH2JMGLyTSuEAr3kTc4Z6RpI2z7xVlyPd2ZrGk6YRwmQL+zw5X2iDlbBlO1CP6zfHEDw5DHv836+8VmiaQyqciXgSo/Iidv2wTkOw9ZV04amIfUAi0rRMFOA8Dzz47YBJPSNBd3lJ2Szo9BVjLjubkCiuJ5cM/Mx89wfP/DqU1sDTd4jr; 20:i1HrZY2TmSYiXTeQkpnjsnxKz4TUirPjhMEjP7Sn1Xba1eqUg3UOr9r6P4I5gLAzKi7Rsd2kETCGXvxEw9PMDxmXVXgNqPwfVgts20LlpJp+N2cBju09J4NXWVH7NdZAFK63KRPWsHFJq6eWN3lf9H8qVUuKV/25xhI+A4cD9BwoG8HVcyHkC3y9UYgTHNBlcNCzvocStj8LQb5MTnOqsMlx8YMsg54HaWYvpeYrZHv6nvN/XG337vtf9m8eppEBSuxe2qyzLf0mUpkG8XZIzN3Ik7vrPOT2Qh2HmhQ+6sss5UxUkf2TeckcW0EZoeueSu36xFMX1FboTLa18YPf8reFZzesgYwZS3MCSGcrBoaF1yfQo40tDUjVoVk5yJLobOqwCW7OH7nrzb9Rvajhr9UNd4G+6gWePMIkJHkAc7TO6mQMzod6Z+9o0Y9oA9tlOh851UAoV9KYvE+6ZeaFQjiDcggYcqGwW43mjFF+Fqnwj4UYTcK7StXL4mxWsWXS X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN2PR03MB2349; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN2PR03MB2349; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2349; 4:Iiq7bEvhhK/wFEWbj8kR/W1KpRGn1iHU4y2UUXY9+L?= =?us-ascii?Q?LvBLPFigtm+uban485ZxJ6DfiqwnmYYPD3qK6LU8fMpSJjaXbhrrFF1IcmBQ?= =?us-ascii?Q?T8uIfVmSCvbn94sFaicexrk2Xc8RSpWlKCCkyOJR6LaPVZG7DJZdw7fziQp1?= =?us-ascii?Q?gIJ3BaJA2mpQIkhOR5BFU6t1ELK+TF6Q2tlKmrEE8r/tVwaH48UuODEg0GWE?= =?us-ascii?Q?wwhcbN1vykWapWtNdokFJnYExW8vWb3XR+lrfY1/CDv0sPg3XxkvlP0ukqea?= =?us-ascii?Q?BRDZovZZH00uULJIjFIXOOy0IVc2zoHZEBcJyucxMYjDahuvLKGfrv8kaYDZ?= =?us-ascii?Q?KtmSUR/ID4oe1YM8wJt6E1yCLMbUg5MfRJ38kobZG9Q0kk6JwTx/CCQ3+kaT?= =?us-ascii?Q?P09RRoT2eZJbkS87/SmXibNl0K937Z4lTUd3PK+6b3p4xUbw8VEITKKpqsea?= =?us-ascii?Q?PoA2VnPyRD1Fh1ey65I+LLdMvajo+LLHwWDDSSyyRrDuFklH1OcX+3G9KhsO?= =?us-ascii?Q?ZRIbmShAuYStZCgfB1O6TZrYglR8G4PeIyzKs8oMcq+1S1WWpVkGFZMAyZyh?= =?us-ascii?Q?kJYEe7sY8/GHwvEYnAKn5RYyhSle2W9yJsrDx1/hY7jVsAs26HU45C3mVhj9?= =?us-ascii?Q?8GLXaEH1Q6nqPflXvZrwRP2LmfD4mIZdvvdaaG3GMxsXoGlkzuEqbm7NyFtv?= =?us-ascii?Q?vWrqMrRp3RE/w8Rr5w3k7ZkHnZP8K7PYTL3TVj9jrN+wWISyVfYEhrUEuS4k?= =?us-ascii?Q?8sWROgl4hglGAq2WdtsRCEuM5VZ5NfZSUU9AVfiyfyKWD/u9fJf+oJIueHHF?= =?us-ascii?Q?f9fde9/TEY7sahOFdEb7o6iA4jyAJve1UKpilLzPRtqh/P9ZyBnaNd7fHmO0?= =?us-ascii?Q?Pgut3rgwDg8xM24jUBKdPCtQMkhKdElQGFUIvRa0wR2QITKi/u/yNkZa8rPT?= =?us-ascii?Q?HWfjm26GenPAaDnGFEDUIPwEW5tyVFD/LOaq7kXWuasifQi9G1d07x0ePVp1?= =?us-ascii?Q?LxSwJ1+0NS4wN64XnctkjM3myFS882YMBw7XPmtWvB06xqO3eT4VX84knFqc?= =?us-ascii?Q?ZykCqEsRcmHuf4vLTg5y+Q5yXyR4JcDM9Ag6d49pXGD7wy6J1tTFnQKGPLt6?= =?us-ascii?Q?hJx6Yae+Vg4fGkQaYG6p21rnsufvJ8z+oxFEjPhQyd/2r8DGAv9A=3D=3D?= X-Forefront-PRVS: 033054F29A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39840400002)(39850400002)(39860400002)(39410400002)(39400400002)(39450400003)(50466002)(42186005)(36756003)(48376002)(33646002)(50986999)(47776003)(2361001)(2351001)(8676002)(5003940100001)(50226002)(5005710100001)(10090500001)(81166006)(2906002)(5660300001)(6916009)(6666003)(7736002)(4326008)(110136004)(25786009)(6116002)(189998001)(38730400002)(53936002)(6486002)(10290500003)(478600001)(86362001)(305945005); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR03MB2349; H:ubuntu-vm.corp.microsoft.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2349; 23:kLteWOSZiX2yRURiJiIXfFZMlV7XcOBs/ur1OG7pE?= =?us-ascii?Q?9r0hUnPhpYhAjDQaNsEcIIKHSabMsMnmNO2/7w27XLpEwNEN/B0tPk6T6f0Z?= =?us-ascii?Q?QULtex4pb7awyt/jQe0eGOTGyIA/9OgnjBa+v0Bgfp4SHUQJmxkIOeajyUr/?= =?us-ascii?Q?RDeIRc6aREQwK7z/XBh/r2BDeRIJt++6GiIUoqRKgJUALXubSX+LQ6grYsEr?= =?us-ascii?Q?4Sd04OGHwprJGU4U7rWtgUtI68cUeUGfZ+Myv24XvuTpZIQGKbDBhN7CslZO?= =?us-ascii?Q?TseB5nv4SkicLLoPW4cFYhjD5Tk7cBK9r/2JnFN5BxtvJ4n3eajBgL2wt4F7?= =?us-ascii?Q?HOrbMDDqMwkuf0VblViL+rtYAGKu3oCI3egiJbOP9MLFaQrlc/aGxPCIu5sD?= =?us-ascii?Q?Iy5Ikec/4O7AcW1pSvZOyKT30kGX4lXc0SSMO2ly5uSCsUXaplxqazvRyOWn?= =?us-ascii?Q?JktBgh5/tZwXfyxY9ddEvn8xCs941HNh7kQErOq3Q+Upanej7YinwBXGY+eg?= =?us-ascii?Q?UtWWj6jRmvGbHTNivij7uNV3dD3FBdjWKpP/uWmVr+PCBMXGNMFt4OOvC9uB?= =?us-ascii?Q?+VLoTN+clE/Uk9gzW0F/q1pxMv8+wYkHQLfOZ8ji0lbaP6rhaE0G3/v9CyoH?= =?us-ascii?Q?Dt888rDhGT+5XROZjYPfXLSfGZr4sDF7a0IPe90qlm43SWnSw8gXI4uJDlCz?= =?us-ascii?Q?JqodFJVV1R5us7bQx1Ae8ATJPwZ31er0rA6iI9cGMWb2/8QZaOGZ8EyhMrWh?= =?us-ascii?Q?IRf01wSBBQ7IAlKvSRpdz9q9JRo4b7MSdDV2sECBszlTWtWGsJnjDaTBN4+g?= =?us-ascii?Q?gcTBLjC4FzygA7bbb/KZuhd/gmhUSRFDLxm5oxw7bYWekp33bWLf+ttLXLsk?= =?us-ascii?Q?j0lyVDufA2ajGj9Zjx6aTiTAvnk2oQUMXRIzoiDHXhn3wddneoz3iW3SgaL6?= =?us-ascii?Q?cj+XYuFH5Qidadtl6glqKq1nkkphvHLMGW3oNHitbRy/Sl+gDog7DquKtelK?= =?us-ascii?Q?RCDwnq7BeAnM0cwMUFOOb7EVXfttCUk1NkUw7opG/SlLZ8B01aPVCeOErhJG?= =?us-ascii?Q?v7vF18=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2349; 6:cRt0Hcmbijj78ag4Nmv200PazsHMknY6iM4pbkxeXoJZ6oZZAMqFwFvq1VncdEnJh232zn8tR60dJ8Piy2XKDNTAzP4vRtGnIjMzgT04ZzV8fT3jCPonHdo+kwLuF16kP8Lm9sIrffRbtlMywkymr+Jz7xXnRNg9ulLb6+tP91+RAG7WBZy1s+09+SH62Q5Y5eweDy/qgtKVpQn4A8eQqZyaH82VJnhuqOdKnfkLdw+ekUhIAjKQ92uOluAyCBrp2v/rLLgrXfxro7Jvx1h2A92txqvzhXgVZhudnzJ6SLArB0HgRT8odLoiYZYY24qIskq79Vvy3Si+3V1UotjINGSEtsa3gygpv1/kvVVbiHlKqXMpqgor18H1/nwEECJILRbnDvQbG+50IfN7MfGmGR+nGGl6Beu+L6K7Ozd/wlOXcxd2Yh44yrn5jc3qzaIU3UuovMQDtF2l6ya6ShBRDijhchGtnb5NKH+oCttpUbYIku8cO2HGlwAsjYm5cS3PG/ypPOumo9MtRNpCGG+CKeFr9p9hjsoW67Waj+P4+lo= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2349; 5:RfWyLv9jQPGjc7V8ra4UdCLjfUM/i8mAg/znP5bMTgyIsSyaxfemM6reUnhvBnNu3UphI5TBOjYq7wENfBy+KuJqnsxKfkFFnbmho9dlAjaxgZD7KoXJexUANsLh+FUjY+T9XGP7s4zu8AosynEyA6dDfBlkyC4YSnrJRw/ZI5bqxir+KqUODiCOV38XlBHJ5zt/5epF4NOPVWxCh+jFC8Ve/pKRu9QWyLR7FD/oUqRLaBVXvQZOmocrRlujhPPZXWb0DAvHXuWvtPE4EQswaC1Z8vP5/jTfuUYUk50tGys8QNRwmoMIbTlfYMUiyZeBGJsiUv2JJLQW2sBGPwAKXxKaaxao5i5AtCTzvjyz1aUPCYFwkxtguVwKVe4Sln4NOX8AQ2V3wXCPPXcThlKErI4iYl8SfkAaogwSoByPZX+Bn3Gu9FXao8O20jbpGvJgFWVYs21ziKDH+IAjP6X3w5IIsISbe2Pu29WZw4q/MV5cULxnf5uc2+c5x70eU115; 24:57SQPJXi+RdiRDoYrNeXXO5tg4Ru6Rs+Mn9mBNHZuXp3jxVUzWAa6fM8dy0pn6DodUTnfV3glziD7NtrSROlBKJGLnuchBR5FGAS7NwqQH8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2349; 7:uxI+zyU1kFXn8RbFknvt2n8WrM0UWH2d4Icjs0wBWLaKYyc14AMB0o5KhkifYwKcVdhJMiWFD9IedTQbsFITYAJTl0t4tVMKSCAtqOc6hGjw0G86N6eDTOqmmbozlxw0Ej4yz/uykD8JwG8ScYzeC1ks0ZwsxKbn0ZIzLIymQvxOZR+SuQM6aG4qNzoV2WBUb1Ow6TjhBnWLZvVUduqs8xVyalszJsJcRs0kkcOuO4s2ba0bF6zoaDdgb4RqnzpHAeMCby5bi5mFFZQ3CC0K/fuOcXThEQtaYCVidmEQKmB7rH1lHjbLlPk+IB9M4O6/vD5ho9j05nIp+S5+PcIsqA== X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2017 23:59:04.1727 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2349 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Downgrade the loglevel for SMB2 to prevent filling the log with messages if e.g. readdir was interrupted. Also make SMB2 and SMB1 codepaths do the same logging during readdir. Signed-off-by: Pavel Shilovsky --- fs/cifs/smb1ops.c | 9 +++++++-- fs/cifs/smb2ops.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index 27bc360..a723df3 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c @@ -849,8 +849,13 @@ cifs_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid *fid, __u16 search_flags, struct cifs_search_info *srch_inf) { - return CIFSFindFirst(xid, tcon, path, cifs_sb, - &fid->netfid, search_flags, srch_inf, true); + int rc; + + rc = CIFSFindFirst(xid, tcon, path, cifs_sb, + &fid->netfid, search_flags, srch_inf, true); + if (rc) + cifs_dbg(FYI, "find first failed=%d\n", rc); + return rc; } static int diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index c586918..5972601 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -982,7 +982,7 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon, rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL); kfree(utf16_path); if (rc) { - cifs_dbg(VFS, "open dir failed\n"); + cifs_dbg(FYI, "open dir failed rc=%d\n", rc); return rc; } @@ -992,7 +992,7 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon, rc = SMB2_query_directory(xid, tcon, fid->persistent_fid, fid->volatile_fid, 0, srch_inf); if (rc) { - cifs_dbg(VFS, "query directory failed\n"); + cifs_dbg(FYI, "query directory failed rc=%d\n", rc); SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid); } return rc;