Message ID | 20170117203205.29033-3-Anna.Schumaker@Netapp.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-nfs-owner@kernel.org> 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 4F5A36020A for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:34:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40A3F285BC for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:34:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 350C6285BD; Tue, 17 Jan 2017 20:34:22 +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 99621285C2 for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751372AbdAQUeM (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Tue, 17 Jan 2017 15:34:12 -0500 Received: from mx143.netapp.com ([216.240.21.24]:26640 "EHLO mx143.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751162AbdAQUcv (ORCPT <rfc822;linux-nfs@vger.kernel.org>); Tue, 17 Jan 2017 15:32:51 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="170180021" Received: from vmwexchts03-prd.hq.netapp.com ([10.122.105.31]) by mx143-out.netapp.com with ESMTP; 17 Jan 2017 12:26:54 -0800 Received: from VMWEXCCAS08-PRD.hq.netapp.com (10.122.105.26) by VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) 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=OyNSkKp5qGusNqjM1EswsUuWYTMi+R67gDh6mC2lXz4=; b=Ly9iyJXQRW8iqhOQqRoKMF3qK0+7OJf3DrtWlTv9Uv3c9lSpeJTBlaeovzgnzx/sfwIMRwX9IOC7RzLs6JVgau+tj6l0VodbY2cE4oAtfiEbWbYBFZMLk/EI0ruJUtOiMQgkASmnsr2g18x+zxULZ64lDGVnotVAg7Gid1vKTYY= 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:23 +0000 From: <Anna.Schumaker@Netapp.com> To: <linux-nfs@vger.kernel.org> Subject: [PATCH v2 02/10] NFS: Clean up _nfs4_is_integrity_protected() Date: Tue, 17 Jan 2017 15:31:57 -0500 Message-ID: <20170117203205.29033-3-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 Content-Type: text/plain 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: e2c16939-e5ba-466f-55e8-08d43f17f17d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:/gZ6vCWr9ksc5von3EyblPCtffkd9XL3OjT8Qsup89f/sEoLbYoYdWb1D5bQObJ/UCkkykAAFzAgW/rdbvldczqYNhX8VPmpVrOUufA2FC5Z7ZRO2DSHrBz2YhwD6twk1sXo9vdEDVlJgCyjp05Ju/lhz9VeqIokE5+uxcX6omxBmsPh/3GxqcOejt1y77Y6v8hvF2gksqa2PSc3XiRfxMghAYPVLgz0uN7L4lpr+l+NlAWXNARSBWMYDxSKdEWAm/W4Rps53CHwuQl73lecBA==; 25:UrqfiZR1fEyC/k0X3U3/sYp2oonqM1Uyt/IpHZx0HCrPTsZ6+OSEIJTFcDL7FGdNlIYC2tuuKRjYa9ads4c8pgkZFop35nRbsCiWLj+UMYc1gmRQl+GxjP09rluF+xl7v6RGDJ817rN7XxiLdxEBZ+1ncssVu12pZYTd3Kh3T35kjA9ov5nWmc31+aQSOmxV9Jg5os+oOdEQ0qFJE6xo6q0y0hDfnCT/tsPziy+EDZjsW0OCIcEC4XgGeMSIobOpKT5wbORYmEQzPwKkNGQurtp5V4kbh98HluaGoQ4iSotRjOnYV7TAgwEV73HeHlG1tox5UgDa/ITHWrPzknzVlmOSvLwztvevdAG4ooPpi+izEMw2+jfiP6WS6+0mRKIGZpfOcviNDguVN5T0dfM+7AR65VfxkWcNLvGkMAcKvy2KC9sMiHuU9SpZyYsC9YrbM0+kZRJBYvcc+d5b+wIWRg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:PYeG7N316kGgfKGEcTYRKZyrb9uixSaud7YJSVQV+r45qbJe89JZ6mVj6ei8sIMbkogQ0Ag6MxpkNT+GFLAyBZqXr/Hx0cdV3G7DFmG7L1K8RpvcdFH1nKcX0ciKPTsuYnAnafB5in6IeX8IhaYADcXeNeLv57Rbbp2DkWODOyUbX03wCKSDVjf92TntNvSBZp8K7fwPzDJVDVqZHx7C+s/1dmPIMH9pZ8VcvKEZzScLlElFwAAf1ft+wAus6nPygPcom93bP5A0KuLNrdGbzQ==; 20:BQk+nwwN7fxqPksut+hXUAiZUYf+y9Am9C4cZlHszQvZxkdFeLkvId3wBXGsTLLtQzlsBx1EjHkcUZ85oqRYnClPM+TQwXtz6qxZbOO1YLLoVfqSJmrvEIEnjJxqIf4UWy9tqtCKu0pOLSfPNJjeq/TeFHpcvypRkqfxa0BrF/LDhVT1oGj60wjSv1HOsPGNUtk0/VVahHc2F4h3WEG0KdkgyudlD3//cOEsB32eGytt+nldjOmbe419LiHSH8Pg4zScPEIE6UMYScjKVx1Y9FAwouu/mPwVzUtgXELpuYf3i1Lczxe8oIK4phgEq3hNg7WTii8w4Imhh892T7Dvo9pLBYW3grIUSgaX7dgxHStNda/Tl+SOOSKU9ff5r2FNwNuzcCii0RtnlF6pYcIK5xPAJLO8TuivoB12yH4nzaaJCRDEDZfZWJKkLxz5On3UT5Vxauctz2JcA89EWskog71L0m64I4KfNos/qaJBW6rJ/kSfQZyvUis+hQ7qHAS2 X-Microsoft-Antispam-PRVS: <SN1PR0601MB16460EEB2FD13908CF330127F87C0@SN1PR0601MB1646.namprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; 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:NK290gvCuAkpe9OoCR4ZT41C1g8jH3QMgUp9z/E7mxhmI1cjbEAXHEyyVn5Mz5pcyY1ReaZiO0Z8UOaG2RxKs2P5k+Ek6mxaQgIOyYbrS7ZeNBHymMZKbNbgHSO9Y2AUU87OELcUN3d8Rtf1XTWw90MT75yifx9fY0C+iq/B2qRbdHNWuO5B48mbSl5n+8QfUUbT1Vu8M0kMOpOoB5lRwoyTP5ok1Fx0yohHfZxs+ixGGP1nSNCbktR6vsDl+s/dX+UsvquOd3+Y4IP8oHhi13IqhT0OobtfskaOX0h9va6K+5ipPZbap7PJ611oi0zqH29rB0lJiQpHCcLSju35SrrpT/PA5em9Q5mTg0fcPA9vV8NKjYdAm9UAxjeOtVuD9kK8RoRlTfs0Gjh9snLYMZVVQZ5nGB2AGGV3zrKF/gBGZZaPY+4e7JAlFV3F/6UeGqpbZ80BjhSHIR7MF8iSfucIBWVJI9OawLRk+peL1ZwJsI8SFK0C/+2CCrdmjGzGicz2p9NZsaBctoTJgBHp4+YvSOtedSDz/yqB2FhTHk5irOrZFKY2JS3l6cESkhahD+SL/tLVnUeACez3sKm41w== 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)(15760500002); 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:9UF7f1ctd4Do/8f1qjoQKGw+btvxhkceJdyoe/s?= =?us-ascii?Q?QNkbRXiUZyTZbA5UcTsEz8vF8rKwGcpPNrIHIZMDPPuFasQ5hrELrqqXgMSX?= =?us-ascii?Q?mRL5kMNHRiiQxF7XNJsY7OExxgC/mRuulQSENVhOstqQdFfURQn8Hw/lKwyJ?= =?us-ascii?Q?Gtu4oKH9oAM/XTdE4Fsc2+/FsC8R6OT/N50k1mbPcJN33Vv9TaY2totWB9KD?= =?us-ascii?Q?y4ZG1WiQPAIK8Sq2Rl8D0aUxS1Ucw0MZK+I8MEfOPbYTwjQp1mMeE5jqebNU?= =?us-ascii?Q?1yvdGCpNXpwNjNlchErGjb8zFsc0E9YXSuoK2PPjA0aaFmZkRktsyv4CN8rC?= =?us-ascii?Q?No1tAHIllQYXZrviSrIArLTFnRveR4Pus6oIzpyRZNEYqglER5ocL3vlK+Ii?= =?us-ascii?Q?kvBa+Ae6zmAuPCs3ZaFhwSqcbjsYoEcKMY/6DJW3QdoO4ICzzK6iBIxKqh2N?= =?us-ascii?Q?dnL/+RrmNOhkZgNzePsQqQRyxEu6+wD8gxownf3kCFqJw8tloEvgR+oAS0NV?= =?us-ascii?Q?OQZMW99O2hChZdo2+1RmZGRA6iFg7JHOfolybnXz9RmwA+wdDdjua+UdGyLy?= =?us-ascii?Q?0flgJ6onyy9ete9REOfnglRP/ram8ii1lfNFzPxiTIJfS5/oToArcdQF5cX0?= =?us-ascii?Q?ruDv7oqlpV2UOsM4xqu37PkGSho38g54DUaFuZbx605mTYVLZdMohW49NWEV?= =?us-ascii?Q?+P/1xGWL6tNRm2VMD0Ks0h5ODyYd36wb4H8CYCZ6speSsyiT9rFkWBwkWhYD?= =?us-ascii?Q?+CBLlKXQQdEV97fVmLieyj7YTf15xRRO7rh0n7fbOyjRzni/iA3TS5+kH2Sb?= =?us-ascii?Q?aBPN5B5Q1JgdzdvIiLJA4Im29217BVFQ8G+ndFyzEZP8GGwl/tdAuxAWIFcr?= =?us-ascii?Q?ggdy2enTpidDJFDpMP5+cttsqhwPk1YAPnE0pJHKGX+72aUpPBXtVtNdi+Jt?= =?us-ascii?Q?3uXzB/rdP3RHZFxpD3mJJC+mqn2+KvQGfza5QHXZgx6XMtSKXtb2fP5njtyV?= =?us-ascii?Q?J32PePy+BIdBwQ3FjJYnPHNDj9EuyjhkChiI0STB0/XxD2dMAIGI7NrEjo7n?= =?us-ascii?Q?e404VKCv0TVVxfpWDK5ECYY+OzRi6FpeRy00UTgDnHLH1FdsxSEe8Fn/+sjM?= =?us-ascii?Q?m08edKeTmQJgscaKfr1UWQt4EPGFbMEy8O8UIJ2gT4xWviKevd+WcG8iShUH?= =?us-ascii?Q?DsN5dNW59ohQb6e3A219KGTWmX1PsY0GjSkNg?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:sj8zcyAe9f0B0ywz4d0dvzthspnXZneiMy9iWIa9STnoFrkS/vau5veVxWLGvzKn3KJ1zyHeADXWDq2wHL15ZmqzBmh22wx6zbvOr348uTNKwWTJnOr6ri24ijYK34Qe0EsLUF2xjVnF15ueknqlWVKxS928ZxoFxpvzYvS2jC91mvoO1fSfkuOYaI1KO8LmRV28ZYyi20TuYZcDPMDGkL5e04bbNni90bgivoKIiLw1kSGTqKnfdm9stRYej9tfngRe8qckYPz4lPfXtS6L6348FpLJNtWhyEWT6CcYS+LKITfqb+q0Z4aF9X9yLfF63/tDQu/5QdMtWZMfn1buf9GCmKJMWwDkrwl6GgwGtKn6LwI3dv8SNgKPwI8naxu/9sW3gUEcGW5i9dX96TxoUElOw1WY7YpLC+Z1jDib3CA=; 5:TUPDlqkcRPvJmGBTb4hnFhwSKHEAvojXoSRXFN1uspImh0B4OBrT967RaeKr3Sa98y2KHiWNMLxuLZ33jzt2Mss7oqiW6rduU9s0H28+VbhfkNWhdMh8VfpAXLmR8w1uUZIjGZgGMAjzYm6rBD0mkg==; 24:OCCtExuSPlx8lJ6B7zTcX787rDrni9Q8V5G/yU4eeSVBP9RNpAYN31NUmnsgBD/9VYxk6dpqOBujLC8/EooHkMIe/nKVmw0VdwhiT9cx6ac= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:c1QPqAbQharft0LSPGG1PKR5FF9Cg4Bm+wtqRRNEeqnB8eTxlpghEYXQVuAlKyss/X6hoagMZ4cKuwLmlhJ/Z3qUx9ZjcfWCCb+ImgmxUsE1Z9kWelfie6WHEC+36r1A2QrW8RLgwteBqWzeI+rDze8pCeiab+9b4VL9akKXgvjd5gIXnBS++o2Tr+JSzjow4M3bNU5Ms3Wn77yOFn5izJH3XHXOrkIjnFiCTA5h7G9mjirMYEAHdrtc5TIyfeEn540mpi43SaqCg3ZFYb7Dj420roHuwrvuKCwfg1DTmlH3prh2L3jyDJHn3ECe4bzLJqwP4oePC4THDTmyYnhtRufTliJueaXIrMXGSV3Vz01wvRfEz6eu+MRsPObKPGklh5WE6/cDLdnEmhM7euQJu+wwMVQvyYegpxUPBtFla8hUg1nrRqbRRjSyEi0YkAO/te3bR+LuTKyz/CFaqFYGnA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:23.0940 (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: <linux-nfs.vger.kernel.org> X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index e10ec98ef5ce..00cb8b6c2c70 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -578,12 +578,7 @@ nfs4_async_handle_error(struct rpc_task *task, struct nfs_server *server, static bool _nfs4_is_integrity_protected(struct nfs_client *clp) { rpc_authflavor_t flavor = clp->cl_rpcclient->cl_auth->au_flavor; - - if (flavor == RPC_AUTH_GSS_KRB5I || - flavor == RPC_AUTH_GSS_KRB5P) - return true; - - return false; + return (flavor == RPC_AUTH_GSS_KRB5I) || (flavor == RPC_AUTH_GSS_KRB5P); } static void do_renew_lease(struct nfs_client *clp, unsigned long timestamp)