From patchwork Fri Apr 7 18:15:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9670121 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 1381A60364 for ; Fri, 7 Apr 2017 18:16:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C6222863E for ; Fri, 7 Apr 2017 18:16:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 016172863F; Fri, 7 Apr 2017 18:16:07 +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 86F612863E for ; Fri, 7 Apr 2017 18:16:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755507AbdDGSQG (ORCPT ); Fri, 7 Apr 2017 14:16:06 -0400 Received: from mx141.netapp.com ([216.240.21.12]:26541 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932127AbdDGSP4 (ORCPT ); Fri, 7 Apr 2017 14:15:56 -0400 X-IronPort-AV: E=Sophos;i="5.37,167,1488873600"; d="scan'208";a="194559137" Received: from hioexcmbx01-prd.hq.netapp.com ([10.122.105.34]) by mx141-out.netapp.com with ESMTP; 07 Apr 2017 11:04:26 -0700 Received: from VMWEXCCAS06-PRD.hq.netapp.com (10.122.105.22) by hioexcmbx01-prd.hq.netapp.com (10.122.105.34) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 7 Apr 2017 11:15:52 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS06-PRD.hq.netapp.com (10.122.105.22) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Fri, 7 Apr 2017 11:15:52 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.onmicrosoft.com; s=selector1-netapp-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=iWldwTI9FlgwJPiZnlQUkVuSsRLV//DMRdqtk+cLI+Y=; b=eEn5I2NtW/44KrxuZHTChJv9zRBF8xlMkZT/Ra4STTdxcJPV1idP8USv4iCwXqal78i4XyVML307lnKX69k81u4hWkHi7SInqMktepC3KYO62PIV6tWNL+yBqYkRfHQGIrF9TV+AovGz0YQIRaHm+Iq1vRVu3bvMATWU81QQrfA= Authentication-Results: primarydata.com; dkim=none (message not signed) header.d=none; primarydata.com; dmarc=none action=none header.from=Netapp.com; Received: from gouda.nowheycreamery.com.nowheycreamery.com (68.40.188.1) by CY4PR06MB2472.namprd06.prod.outlook.com (10.169.186.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Fri, 7 Apr 2017 18:15:51 +0000 From: To: , Subject: [PATCH 15/34] NFS: Remove extra dprintk()s from namespace.c Date: Fri, 7 Apr 2017 14:15:09 -0400 Message-ID: <20170407181528.2832-16-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170407181528.2832-1-Anna.Schumaker@Netapp.com> References: <20170407181528.2832-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 X-Originating-IP: [68.40.188.1] X-ClientProxiedBy: DM5PR20CA0021.namprd20.prod.outlook.com (10.173.136.159) To CY4PR06MB2472.namprd06.prod.outlook.com (10.169.186.140) X-MS-Office365-Filtering-Correlation-Id: b478447d-8da0-4ce7-0349-08d47de21fe4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 3:fbHSYYZyr65PEwG1jbrfEVWCdG02a4ExW1N7jqveOjlk6fgt0I7jED8GVaNgPBxXmKl9cXr4Vfe2n1/Ny0HBog/mEaXp4GgdlHP4Ymy7AohfU6G83uchcY3CVFyH3y1BhMUZwxnh0FhyNNtipytoPFCnHy0lflY2JJO5kSUAM0wf7cFtf6VY4qzwx7JbM+FoWlZLsRELOft3+DW+WKyiCAuqwjhPq0aztLvhMdN+VVDVx6ftmCI/Q87PvE64uhiqZnxX5FprBmsD0NpmctDdzMkLcQ6D8cKLTB89UWFvdG9Br/4oac9BEgZ6sYBH5oVuKY26Arkz34Bjl1Ecd4blQg==; 25:dvAAUmFVLiCLKG0VHvg9Tyq7Or0hW+KjsHZr/6WlSgt+7AEAc+QxuvxL5ACwCjbPRVoTMsibeOXum8kMO/vZ+V4n/Z7AcBhCCFQoQNzWBNvvLwuBsbhCrRxYN5NExSqKh5i+DRvfEBy0AGgjlXMtBACkJ3UMIqSC3xKd2JTD4Gj52IvF6Lw6qrf+cvOj8iwxG6zJ4GSepccxeftprNnYaXFfdvnLTFPgqTwvFGtsL/cvA3iWG6WVIjYORWyUnkocFQ9iIrwW4GKJ3PcF9mQx3PvwYGtUwOLVlyk901ZYHmlxgqm5U+S22bjPiaP3omBal5siLNoJQ28P2Qym9Nv6aAAHGx9co1vtZZbJesudOLYo61oQxPqq37/MWY+/n8FwQ7L+CnJClCl2uGrLxINW68xve2XrgPJEC++AIPliT1R6WxrrmX12HqnQrEawI/LGYxNswZ9v6uex5248IkQ2nw== X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 31:gk2gAqEVmYx3dE68D0bAzYJ8pTrCc/pLBaiZwOgoY55nr7a4DlaCt9K7Qff479d+2EH6TL7m/KBcb9hFadki5LLzRr4AW5r64TJrKFeOeLrfmxzN/kOAwt5PUNH9gYs53df6UcaFs1ze4btbj0UeXx6APvPD4DBrIrOOg4UdoGSCwE2tzMevv0WFNxLklhFl1QK+U2qYK8jNPQBZBHLO88i8D50ViHuL+1Ib6mzsPYW07JH5O/VSg6LsTNrSrWBdnNKBCIP2aQtZIRsp6Tk7WTJ7nKBezPaxdudNrxWNgDw=; 20:aMVTthYbzKEbicL+787fZwqKcIyjDyWcgAh2qkHnkRPwoUdRcdA6eUzSiNAylYADZdnBX1iuCklQVQS95Tw3hFjR4bWOPI37vv3gFgHN5GzyCqreF4U07iFupDiIqDGgsBJ1EV5dIUSoEzmc5k7bhpQnC8oT820KaXaPE3QuPoDW34ysgdoZtrxAsV7IhNWbXz3QkrZKBf7UOxmiqWxAHE7hABMU7v9homT+OBjZkVX9UhfLRoiCvwyeRDHvHtxQsdKJwo5PWFBQ5Na0gADn9b/+C2LU/q5GP+MiLrHQ38YxbKgLX9dWi8hUEmPESGopJ7FwVILOgQAfkT9gkuBviVLq5jVH/NeRvkqZx26aCKiO9x562Lka20gNlrurfeV71hG3XYybvga7vjCK6Pa1ANERXHF6f1t5IjIGSSW9bsRifrJqPBXjagG4hiJZDC3kE2/Tv6qVjgo+uq4oCla6FzGG0XE3PTMRYDKTGIjdcaTAUZoLuoSDKanGcUpz574Y X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(20161123560025)(20161123564025)(20161123555025)(6072148); SRVR:CY4PR06MB2472; BCL:0; PCL:0; RULEID:; SRVR:CY4PR06MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 4:PHqAuIpinoFpFIXof44JBVmIS3K6yI+H8Mgfkxh0bCR1cIooiy1G0rVOzJejDBYHvQqHV7N9V8Gh5GTHJ/K5V9qoNjzuVRB0BgWTxGyVsWdGqoUkBmEi1NtoZh2DJ2uRToC3nErCp4GPwzZIlYonV0MkXtXMmn0eAVJX4f+TjR3a/hbf1P26TUVIoZqsSsmd8VeG4hSa8yDbi2WIToeIfRA281X7AzQbA9NQJtdVceS5zcBhiU0go/PFnLfnZLB4EnUyLD+8TgV6BKlWXavPyi5imrw2KAN4OhrFBHpAQPFPQ8fF31I6t4xFP1WQYk1yQcxQlxslOAzW9CQnTb9JNOvryxh51lDkUGMVFIPEbV/qSYshq+DoL4mCFV/FsQZmd283/oYsEpZlXNtuXCJr2rsLF+T+g9Aooo3hm35CxZwTh+7BvEJ5D0CK3oN8dVEl3hZpO0RxS8tNPZL1dNO/AM+/PdKDKSK53QJ2jaUih+gywtfpTHM7e6k3mGjz7hr3mk6Dilj9HJGGfgDLRBtocH4BkTE37UJZz9myrO9E7KQIECLytAgV8hZXhrcOB+JIhSKqbe7DGauD6+itmfvmFb78y2RjVLEfqfjtfsI0wiHWrp6wG6dyaqKPrYWROvkJ6g+VigVrb9x96xmqUmQEKu0kvW8OPYQVXXi6cfr8uD3A9LcJtRis9qEKlxhDR+6rflHQbUU1p6n8QJPpbT3swMcb8wTOzwrfONSk1OTzMdw= X-Forefront-PRVS: 0270ED2845 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(39450400003)(305945005)(189998001)(2950100002)(5003940100001)(6666003)(7736002)(86152003)(6512007)(2876002)(6506006)(6486002)(36756003)(5660300001)(53936002)(25786009)(38730400002)(76176999)(50466002)(81166006)(8676002)(50226002)(1076002)(6116002)(66066001)(42186005)(2906002)(50986999)(47776003)(86362001)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR06MB2472; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR06MB2472; 23:mHorRZlyzb3W40RvXwN32cd0/Bd9z6tpGADKXMi1/?= =?us-ascii?Q?98j4a+VMEEC/SiMf9zXl8VM5hWOkrQBpHR6JW19nSZ0xA1V8vcPIdJ5+Zg3z?= =?us-ascii?Q?upiI/AWsG53RDtpxBN8EwNPrUHU7PiOfRYqTeJjgWtnIHIKXASF6l4JndBJv?= =?us-ascii?Q?jdL2LK9k2BgIbFRMVU4+5T0zoakaG/02M3EeoBpilYk8u19fpd+rDVOwVz+j?= =?us-ascii?Q?KSlluY3cQMIJCRKncll2MC8vgt0IQvXA+vppteJur1orxEfoM7OELBnUF4l0?= =?us-ascii?Q?KzkFlDnRTqXbIyO8CA1UFYgUOXXc7thEpK2761rtG5ZQyksiRpMOZgWacQ4u?= =?us-ascii?Q?fwlDVo0eTRrwhK92RatX7U0oH+/hmnSg2T3vF5X88AAJwGTJWtSAHs5x/tZe?= =?us-ascii?Q?VvxwHpw6HGvr+OzE0p4vHJ+jM3E70swrxOp36L5zWXr9QrRCiRMalfZuB3dQ?= =?us-ascii?Q?NYFGUqGk7Zq2ct8i/2A0Nau2uRGnsoaLmhUQX50ZQXApJ/dyux2mtKUBFlbJ?= =?us-ascii?Q?OTtALv7TlWsaBKYcmSB/RIuCFqBd7q+72Dg2tbyG08b/posQrkjRKK3G97Lv?= =?us-ascii?Q?x9Vv3xCX/oGRB5/0YS6uJP9tUUXK431zC3+4losluY0FbvIoJUjWQDElx/Yy?= =?us-ascii?Q?RLPuTBWFF0JUaKTO/ySdPkw9zysWFQkMBRwpw8arJ/SeceiGIPoabtxVDGqP?= =?us-ascii?Q?GtoVzASjPzqy+mNmnFwy3uoAJ8KJFP7UCUwi/IPkGwmP25jKrP0Na4bO0mS7?= =?us-ascii?Q?bU5vlLM7L1NvY9iHHFpo6XIm/BkPEHvGJ0OIkXaqNbTDCY/oI0x0S7Va6IP5?= =?us-ascii?Q?a8VEljOA74Y6MWnsXuQLAaj2N/rfjdv/fbWFiRwy/iPTuen/GDHytp5Haiy7?= =?us-ascii?Q?ueB/mTiBnC2tDZL2oku8G51qJUDpCYwwzaJb26t7iVZuOld/68l2F9joBz2i?= =?us-ascii?Q?Bpyvvkpx6ojjJv+gjTeUJD+69jLxl7mQj3oDHLoVg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 6:fQSmsLzAPOXgc9ixdoNQNh38z9WxrWDOwgPrzGPOH2glgkScPShkJT/TFY7Af3T1vHEo0hwHdn+c6HEjjM/Bpuhw6RuNWDl6wdlpnkBsO1UX6KZl1oV12IxwuXjPCtipiUDSmg5OYOI7LNon4cStn3rfvKL/WLMkL8o4cgpaXNooCQwKW4OQsob28zY9LO4LLZwALTe5D1jFjWpSO4L1k8AaPggFnTsLrPOqa9k/j6bpyg5anY5r2Mn7JMD1FxhcDLjvGVkgY8rTSnTatYlN2vrvubJIRMoZw21WrWdEdiZQbOq8JLPjPGi706NANoBmk6XGnmHUyKDHvO4zwzIfcvMeC+YtIqvp91PegUUw7FIv7bYnv+bT96tAiUzws6i98xL0eZZaCkaVHItGOlVdpu5VEEZOUOAthH0YjA64SWYoLniwv4jOhk2qDhEAUTxBtTqHkiCwJF0LpiKsaUqNlA==; 5:QyNIrLg/5kDcEyVriykG+HLlpHUUHONro9MXx+2kuOZ3CFXPJyKNu5usZKQpNNffLbTme6t9Q2Cn9Zo0XGvWvFQcC53FzMvHkIjiZVC48DnA+GOBtVQgzPvapk4Nx46jkawuyvQ2fjOTw/wVnntXVw==; 24:4YOO3jaIhieotAPxZOiYn4fYTykH3dFfHrUQEF/wyarubYjid0zDS7TzNQW7lt48XwMbbuiYQg/dMPiWCrB7kNJoJo9AxepAesgGO6CCRks= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR06MB2472; 7:73FffwWMBB5TQJlG5bvyx9ssMuIOEbERgNiVLMMbc3NfNtKDeRaobKpMlrNT2CLNmXfa00R0YIJsS7MWPEGOwzm8TmkUdwXcJAtInDmA/PZ0oBrm9ElhafdK62Oqfs4oj00FxHzExTf3eJvCHseHhV1aE1qD4D2mKvw/JlK0SS+LgvOwHQVH2Fj/kDSuBYGt0qarLP0V0d8x5l5N2G3tAY4SKptAf7yoXCkW8hEF5DxHrkrkbRqg3RUx8eVpa7fpedRKvCWJrMrzniktk0t+FzW+Ms0rowkn59aochUmsywQ+SNTE0BlL/64FpG5gyjybvRUK2ExjMAMoqAa8qEV6w== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2017 18:15:51.4397 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR06MB2472 X-OriginatorOrg: netapp.com Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Anna Schumaker Signed-off-by: Anna Schumaker --- fs/nfs/namespace.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index 786f17580582..1a224a33a6c2 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c @@ -143,11 +143,8 @@ struct vfsmount *nfs_d_automount(struct path *path) struct nfs_fh *fh = NULL; struct nfs_fattr *fattr = NULL; - dprintk("--> nfs_d_automount()\n"); - - mnt = ERR_PTR(-ESTALE); if (IS_ROOT(path->dentry)) - goto out_nofree; + return ERR_PTR(-ESTALE); mnt = ERR_PTR(-ENOMEM); fh = nfs_alloc_fhandle(); @@ -155,13 +152,10 @@ struct vfsmount *nfs_d_automount(struct path *path) if (fh == NULL || fattr == NULL) goto out; - dprintk("%s: enter\n", __func__); - mnt = server->nfs_client->rpc_ops->submount(server, path->dentry, fh, fattr); if (IS_ERR(mnt)) goto out; - dprintk("%s: done, success\n", __func__); mntget(mnt); /* prevent immediate expiration */ mnt_set_expiry(mnt, &nfs_automount_list); schedule_delayed_work(&nfs_automount_task, nfs_mountpoint_expiry_timeout); @@ -169,11 +163,6 @@ struct vfsmount *nfs_d_automount(struct path *path) out: nfs_free_fattr(fattr); nfs_free_fhandle(fh); -out_nofree: - if (IS_ERR(mnt)) - dprintk("<-- %s(): error %ld\n", __func__, PTR_ERR(mnt)); - else - dprintk("<-- %s() = %p\n", __func__, mnt); return mnt; } @@ -248,27 +237,20 @@ struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh, .fattr = fattr, .authflavor = authflavor, }; - struct vfsmount *mnt = ERR_PTR(-ENOMEM); + struct vfsmount *mnt; char *page = (char *) __get_free_page(GFP_USER); char *devname; - dprintk("--> nfs_do_submount()\n"); - - dprintk("%s: submounting on %pd2\n", __func__, - dentry); if (page == NULL) - goto out; + return ERR_PTR(-ENOMEM); + devname = nfs_devname(dentry, page, PAGE_SIZE); - mnt = (struct vfsmount *)devname; if (IS_ERR(devname)) - goto free_page; - mnt = nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata); -free_page: - free_page((unsigned long)page); -out: - dprintk("%s: done\n", __func__); + mnt = (struct vfsmount *)devname; + else + mnt = nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata); - dprintk("<-- nfs_do_submount() = %p\n", mnt); + free_page((unsigned long)page); return mnt; } EXPORT_SYMBOL_GPL(nfs_do_submount);