From patchwork Tue Jan 17 20:31:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9521869 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 EBDB56043D for ; Tue, 17 Jan 2017 20:34:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCD48285BC for ; Tue, 17 Jan 2017 20:34:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0AAF285BD; Tue, 17 Jan 2017 20:34:20 +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 4DE64285BD for ; Tue, 17 Jan 2017 20:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750947AbdAQUeN (ORCPT ); Tue, 17 Jan 2017 15:34:13 -0500 Received: from mx142.netapp.com ([216.240.21.19]:46730 "EHLO mx142.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751142AbdAQUcv (ORCPT ); Tue, 17 Jan 2017 15:32:51 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="165683699" Received: from vmwexchts02-prd.hq.netapp.com ([10.122.105.23]) by mx142-out.netapp.com with ESMTP; 17 Jan 2017 12:27:01 -0800 Received: from VMWEXCCAS08-PRD.hq.netapp.com (10.122.105.26) by VMWEXCHTS02-PRD.hq.netapp.com (10.122.105.23) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 17 Jan 2017 12:32:24 -0800 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS08-PRD.hq.netapp.com (10.122.105.26) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Tue, 17 Jan 2017 12:32:24 -0800 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=x5fRRpFyrvwtglVuf6/5ljDe7FuNJNGdc4787IIJr+U=; b=qIbSEOrtt2EUKD7qCfwBsodJGAMNLusAnWUd6D+mTx/CZy+JkDjrCHt+5EyVgl98orKQGjlDUO7L40n9/2ZAlmuR2mIXlw6X/OsWRIgO2XQFiDot3HAb0CT+oFfsgVS7hG+yGTJ8jQNnQosOp/PW23u+lGt0vcBr9pO3fSHdyd8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anna.Schumaker@netapp.com; Received: from gouda.nowheycreamery.com.nowheycreamery.com (68.40.188.1) by SN1PR0601MB1646.namprd06.prod.outlook.com (10.163.203.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.845.12; Tue, 17 Jan 2017 20:32:22 +0000 From: To: Subject: [PATCH v2 01/10] NFS: Fix inconsistent indentation in nfs4proc.c Date: Tue, 17 Jan 2017 15:31:56 -0500 Message-ID: <20170117203205.29033-2-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170117203205.29033-1-Anna.Schumaker@Netapp.com> References: <20170117203205.29033-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 X-Originating-IP: [68.40.188.1] X-ClientProxiedBy: MWHPR09CA0042.namprd09.prod.outlook.com (10.173.46.156) To SN1PR0601MB1646.namprd06.prod.outlook.com (10.163.203.140) X-MS-Office365-Filtering-Correlation-Id: e9920b66-a0a8-4205-b144-08d43f17f10d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:8FpXmXpJucTTLL73oqIXGDB4QWAvcZM1Wq0hZlLCbqAcP2+34pImXqzJvJ3sNAMvOjw3Pcvgt7lPPaX3IYbKErt0DwH6R4O/eKzWtuGzZkEClPpvqi9GsZkEw8viITRrufvzaKeNa0qwQn8xuznuRohT/2PDmEGVluByrBYbR7NgHRbXZJ1jkj/pMU7Afg/8pPCdxVxRQgDcJcXgOKiM0OJyOLV7qc/MZG55PeaVUSGc+XinmHG+WBqBQJnzspplz+1f+fmg3d25AvZ1kCuwKQ==; 25:r/w5hL9jLG/2BxrXmFhh/PhNDTPjqU5CxTWgNgU5q0KzN2HSOUiyvi/fbVatcmhmPfXoW4j0d4j7gcU+CAeTQQpU3aF7GKgNAQUoqDmy71GxypB4yjsErxjQmDbBdpm2gm0hDwMywghJt2gI97ELTwEb3KXptQgswMtfsDWnXBVyNbsf81qk/Txx48m2y1TNAkl8lho4p+t6x7hmzp3fVo56kJQ5PhYqQpvGdvw+vziZA97a4cqlfWlcbiZmQ69/aRiQ4Ppowgfc1jjZLzlJrL9rhq1Rwiz2tJBhpEKDPv20XbLnkOc2jh52PYczn0EYBH/bd55jxhKNfp0D7WadzX/ljmVcjXrRw+SlHj9V/uSdDQWb2RV1OKVPulQ97UPNm/EBTkxRnZj2Vg3LiP8CViMCLZWPv/i3Fa/sKr/Q0silsNldPWYDg3Mo1/o2sYhTvtYVIHaDGngMrRuoUzQGFQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:/9vile6JRm9iByMrWrh+O3DFm3+pphyHQUFLrqpG6wQLd6IQ6FsYHnF7TrujxAZ5UYmP+eHSxcIpjMoJVQa7sN69NaZGzGZo4QZ3JDAxq9FK0sfKXI2XRa4spA0CpTZYmyzKbehCHVI6yr2nlaOrXJ4vQ9SjZwdCllLPGJfI0Nzjb/CXVBs2jfPapgq+UoPy47R5GycPBjdvVNKumidTiwlHQWbagBWVDSkgXJZrm306Yz/7wiLRtFjCeNq1Vkev2SUK9MQfCiJvRDfRzSn/ZQ==; 20:w2LluF4Ij5PwLaBbHs60SxZs1RonbeanXX8z+Ltfm1AK9OyiEUBXP+PxvGBcfuN0xXA9eTg3zQ+wYl3oPTn6tixZGJMXStv0VupvnvydN+Q4LhYP7gG+ush+mhLG/3x9PinQ/TjGmkUtQwbTKSxWGDp6hvOXc68j5GC1ut5sd9ylmxIkKVGld/sI2BZFbFSUhwPIF8N6ARaDlt+GXE2TJ4ciCAtz1XtWcmPiVIvzxt7j6N5m/4FVNPZS6/JPd9zQxEmEiJmz740tyk1y0zkAh2wF3gX42Ickyv5uuVREKVA1tXtEJURalmwKfOl5NtYKdpyxZApIeIfJEDNuX4qwKkqU9rVwyD3Bbr7PdNdtqy9kucdjHtiJx4xY0cGR+VQ92ecKoLTclEts5gtm3TQLnnu76Fr0l9qtqHyUgMDiKe7p1NyhuqrfWVCWcXeLOkwCAm8hiMuwOAfpt3sa1KKYmY8T/XivOjwM8WUuEVE8Ca7sioIP6ic5rkdOx9DOLsJZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(158342451672863); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148); SRVR:SN1PR0601MB1646; BCL:0; PCL:0; RULEID:; SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 4:LIae6GbHqIA2CESJg3DvtzOtm3ELWkFN+fY1P2N1B8SQEpRyHbKTws2S9zZpa/jvB53b/Le0/92D94sqTFsYG5FLn+ze4dn4Q6XI9JRPXLsWw3TwmKT44pZyQLMAaH3BeT44NuUjCQtKCn/KtOZU41r9PCJMzO+4IyVDQlcQD+rO+crgIaFMVTp852lZlgNgX2STMnZ8aMNEADF95NmotzCdwoggmuaM+B0keajntO921udxNXZkTEgbKtayO2Hhf08KmZquNu0Okr44i5QsJzL1FXQHioUA+S2qA6O2yUBgDWbvaP0/VZ0jFmJSmUv24V/e3dkhgpLoBaEs+K/PNiHj4lzKtbQrH9XG76gGJtCKOGSYD94qE+2PJ3E5wOle6WN/zhqCtbB5jecy1g2KadRcz34/8O64gUAEGvSGQVEaPpXDYSszgNJqIC3MfmXJniCCd76kj66OYiitFXy/NWeKjjdE6dO4c0sj4s0cbKXigyfK7PKICr4HzHHFNz3kDDYtXIFlwQF1aAkYctFWWXBbmLz5wutMgFbxb5ikzz0h7hny9CInWfx2KkD48oVB3NP689ql5too2s0VYQ4a6MU1lK5FX9YXMCLU31gjTSTT4bAEe2nrtgG0I9Z6NtFzMfoGaX3eSN857fZGwEtEmQ== X-Forefront-PRVS: 01901B3451 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(189002)(199003)(50226002)(107886002)(81166006)(97736004)(8676002)(81156014)(6916009)(6666003)(305945005)(7736002)(92566002)(105586002)(36756003)(1076002)(53936002)(2351001)(68736007)(48376002)(6512007)(106356001)(42186005)(86362001)(50466002)(47776003)(110136003)(5660300001)(6116002)(189998001)(450100001)(2950100002)(6506006)(6486002)(76176999)(38730400001)(50986999)(2906002)(5003940100001)(3846002)(66066001)(101416001)(2876002)(25786008)(86152003)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0601MB1646; H:gouda.nowheycreamery.com.nowheycreamery.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: netapp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0601MB1646; 23:lsRSFBBt4fP579VkpTWXAyWKAaRJimU6juDhulJ?= =?us-ascii?Q?fiDK5nMpfoSU8oF9Ii25fIUILpiXw+0UdJi302nUF0bR61aU4asW7Jwqn2cJ?= =?us-ascii?Q?JgxlXDUxFjZjugLRs1mLW+i8Zl7ZnKk2Lav8So5oORf9TYXsmdxrQk/TY4ab?= =?us-ascii?Q?5busbLvFMYPhf7joOJe6gdGHy9aRPnXjKcZxBXAhPgbVYgTG2n5QZ7Tfm/Tt?= =?us-ascii?Q?/OxmTAhvOcTPpkkkUO5EPFqHG013m+ZMifNO4/JkwKOwBcrxrG7vRSijwb7r?= =?us-ascii?Q?LfKh2FOHueqoaZgmL7KnmcfPD71kXIN/LE24cgCHDSjJvGaa8XPBR6ZQRrs9?= =?us-ascii?Q?nC48fmCy9divDwAMsGeSuJlTWbwSDkm27MkSJ6pqbnb7KZamwa3r/JYj7LNR?= =?us-ascii?Q?wVUgGqi7ndAx4cChpAxX5/OKIvqv35oA6SMJ2J4M5Py/lsISmXWVQdk9a4Bf?= =?us-ascii?Q?IhJRYb0DFip0RhQQlQnUwjtLQE7UvPTYoYPUBA+wslXKW3cDfdyR5llkTndZ?= =?us-ascii?Q?3MTUydK5omsu6+lD3QbPD9Qi0uFEqTHvHe14LB2P3LRiFXeNjhIZVxgPpVs3?= =?us-ascii?Q?SwQd/UJnZgpN3l4GNUodideezoZO27dooog2WmQ22RZXM6DTMem3/jgevQaa?= =?us-ascii?Q?FUa5Su9/XEplGbEikBPZbqhuvVsxXrgiN8vCKMsCVao9iripjOGhh7CsxZUM?= =?us-ascii?Q?lSHs5asVoFYTtYwPcyq5HmBWS7XPUr5hgq+F08vR/APWFlAPSpeZk33Ygb8v?= =?us-ascii?Q?EJ+SS3daNUqNUc5jrcVFMj198OD9ltFfYFCH2FS1AP9lBtmLP4SykcloGTB5?= =?us-ascii?Q?+k/xRVgU2x/Z3/3QWa9Umn/igIsKIJiA4iT5eFIFKhAJypHMTfL6okf2o8ht?= =?us-ascii?Q?KH6scLWIIxri5zMVx/wb2TqqaH13e/zf/w/+6ZarX7lgNy+rvIp7vzQI49FC?= =?us-ascii?Q?n2IkOuKbCxsBLz8MnwFQvgA7Hx83DHTzJjPsV/TJGTv4r1hGjH1AiMFoWRm5?= =?us-ascii?Q?3jRKNyleoFBnYfpHbnjcl8vxYUIcaA+FQO+n2HZlivJmcuJGvpMztTkuXKzO?= =?us-ascii?Q?hGSpu+8+87q0UzFhvKpNF4hp7MOfE3ZMnxyh1MAnLZeH81tJEhrSrI78CYEC?= =?us-ascii?Q?tHJO9TVNUmM6Rs5M2C26JdC2xe+wKi4JB12nfDj3cZssKqUcCWqmoeOyR4V4?= =?us-ascii?Q?cEzFS1iq1k4WX/zVRkhRHngtpYzgRHRhiyu4H?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:JHCLQ3M6n4rfmyb/kxhFM4nAZM6gg+iwAkuWk9C1824dR6QlmZX11vmQesbkOO4LkHs/yReXqH3inVAAqF8+fd7vNDcicS7iXk1dQ+KYCmg+kO3Tkb1FmarfXqB0bJW0ONczFtTRrgdG1nhR731ONGcOwqiEwgPwioqepP5Xq4y/5qEkyoBti5P8kW5zyRApGXryhbXoKF9ZJh2UMek9DflCXvUX8UflxQxdsLX0vELZ3G3+ZM0PMWQ6QnXfOr+eaKoXOiyOhrXovGhUMjw2Qv2pXL788GQCMG/hZAMFSi8xEa9r5UwHj2Bvr76i3r8Qk9WBAWI1QDv26oMaC465cu/PKGDAlFS71QWuJBYJdWHQvsdOd/EJe8K9aQ85AZm79XlNmtu29OsZKIr10GWr4vCCse1BpjqH4/4OnqwefKk=; 5:Ys7aHLaX6JtoN+2EOWqCpOJmZpPwwAVvakLdqADvMg3SCpkUCOnQxGp6JM0eC5EAsdOsWj6qQgZ/FPwb1k7eDaf3ELvHMpJw1ShLD5IkUr6N8vYrixjphiw7TER33MfKYXCkxAozoHLAdvJW+bHTjg==; 24:u7N+CO1Ka6KAuG+R1qt817WL7EpGnkYrpjuxb/uHiCl+0J9+8MIXAtlbdFU+BoFs9HtPZ/3+klC2R3ISljZwkbXbuf5CRtdZ5QD/Siq6vtQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:+6g6quSEMU719wTjK+9rtJfpIIfpwGRUhdk8Q33QRimomcWyXDYYy+qyncxPORUH/7mRMHOquAy7gusdTm6VP42rvcNlxtIG9alMIRdHAu8tQ/uCDHQjAqIVWkoshkxIRUEVJMN/5HdRPlmrWusnccSN9NdHcvOMRugQRiadPTC/0WRacX8BXVJNSJucMpx5JL5Ht0HmYBnFIZHjBE7gfp6upIcWo2GHXiP4Bwz0w/1g61FjKIEXHU8MqrzBH0Akne+OeNhkSddLjAagtRueOQaPBBXJGdhuBXB90oZrTOXOb3MLQKNQa2QwzV1NUW/6WmSPoABItDB7p95hThcuhBhMOs1cTA4hDBvFCxQEZ5tghGnnxRoJ2Le+kSL5Wuj+RK0VpafOGaSyexnlNcKaps2VSN6okMcM5WU3HhX8KEPUlgki01Qop47KWS9CcJ5Q4poPTIJxS/G8YoIw119Y1Q== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:22.3683 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0601MB1646 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/nfs4proc.c | 56 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 94fdf26f9bf4..e10ec98ef5ce 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2208,15 +2208,15 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover) data->is_recover = 1; } task = rpc_run_task(&task_setup_data); - if (IS_ERR(task)) - return PTR_ERR(task); - status = nfs4_wait_for_completion_rpc_task(task); - if (status != 0) { - data->cancelled = 1; - smp_wmb(); - } else - status = data->rpc_status; - rpc_put_task(task); + if (IS_ERR(task)) + return PTR_ERR(task); + status = nfs4_wait_for_completion_rpc_task(task); + if (status != 0) { + data->cancelled = 1; + smp_wmb(); + } else + status = data->rpc_status; + rpc_put_task(task); return status; } @@ -2225,7 +2225,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data) { struct inode *dir = d_inode(data->dir); struct nfs_openres *o_res = &data->o_res; - int status; + int status; status = nfs4_run_open_task(data, 1); if (status != 0 || !data->rpc_done) @@ -2856,12 +2856,12 @@ static int _nfs4_do_setattr(struct inode *inode, struct nfs_open_context *ctx) { struct nfs_server *server = NFS_SERVER(inode); - struct rpc_message msg = { + struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR], .rpc_argp = arg, .rpc_resp = res, .rpc_cred = cred, - }; + }; struct rpc_cred *delegation_cred = NULL; unsigned long timestamp = jiffies; fmode_t fmode; @@ -2909,18 +2909,18 @@ static int nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred, { struct nfs_server *server = NFS_SERVER(inode); struct nfs4_state *state = ctx ? ctx->state : NULL; - struct nfs_setattrargs arg = { - .fh = NFS_FH(inode), - .iap = sattr, + struct nfs_setattrargs arg = { + .fh = NFS_FH(inode), + .iap = sattr, .server = server, .bitmask = server->attr_bitmask, .label = ilabel, - }; - struct nfs_setattrres res = { + }; + struct nfs_setattrres res = { .fattr = fattr, .label = olabel, .server = server, - }; + }; struct nfs4_exception exception = { .state = state, .inode = inode, @@ -3034,7 +3034,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) } } - /* hmm. we are done with the inode, and in the process of freeing + /* hmm. we are done with the inode, and in the process of freeing * the state_owner. we keep this around to process errors */ switch (task->tk_status) { @@ -4885,8 +4885,8 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen, if (newpage == NULL) goto unwind; memcpy(page_address(newpage), buf, len); - buf += len; - buflen -= len; + buf += len; + buflen -= len; *pages++ = newpage; rc++; } while (buflen != 0); @@ -5209,8 +5209,8 @@ static int _nfs4_do_set_security_label(struct inode *inode, struct nfs_server *server = NFS_SERVER(inode); const u32 bitmask[3] = { 0, 0, FATTR4_WORD2_SECURITY_LABEL }; struct nfs_setattrargs arg = { - .fh = NFS_FH(inode), - .iap = &sattr, + .fh = NFS_FH(inode), + .iap = &sattr, .server = server, .bitmask = bitmask, .label = ilabel, @@ -5221,9 +5221,9 @@ static int _nfs4_do_set_security_label(struct inode *inode, .server = server, }; struct rpc_message msg = { - .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR], - .rpc_argp = &arg, - .rpc_resp = &res, + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETATTR], + .rpc_argp = &arg, + .rpc_resp = &res, }; int status; @@ -5769,8 +5769,8 @@ static int _nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock }; struct rpc_message msg = { .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_LOCKT], - .rpc_argp = &arg, - .rpc_resp = &res, + .rpc_argp = &arg, + .rpc_resp = &res, .rpc_cred = state->owner->so_cred, }; struct nfs4_lock_state *lsp;