Message ID | 20170117203205.29033-10-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 792B66020A for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:35:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B20A285BD for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:35:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E3B9285C2; Tue, 17 Jan 2017 20:35:58 +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 00B5A285BD for <patchwork-linux-nfs@patchwork.kernel.org>; Tue, 17 Jan 2017 20:35:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750991AbdAQUeB (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Tue, 17 Jan 2017 15:34:01 -0500 Received: from mx144.netapp.com ([216.240.21.25]:18539 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbdAQUcw (ORCPT <rfc822;linux-nfs@vger.kernel.org>); Tue, 17 Jan 2017 15:32:52 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="171284169" Received: from hioexcmbx07-prd.hq.netapp.com ([10.122.105.40]) by mx144-out.netapp.com with ESMTP; 17 Jan 2017 12:26:30 -0800 Received: from VMWEXCCAS03-PRD.hq.netapp.com (10.122.105.19) by hioexcmbx07-prd.hq.netapp.com (10.122.105.40) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 17 Jan 2017 12:32:30 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (10.120.60.153) by VMWEXCCAS03-PRD.hq.netapp.com (10.122.105.19) with Microsoft SMTP Server (TLS) id 15.0.1210.3 via Frontend Transport; Tue, 17 Jan 2017 12:32:30 -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=BN8CNu2gKNTbXkdWiNpIYyQLpH4SGagRVZnZL4DtNRQ=; b=gnNU73pya79muhtgLfInj8SKMbLSdBBLkPMia6EtBXCQ9/av2eyDLFkhq99AAsIKf0d5shmCMAhhOukVemUKmIdEY21/k6UZ6W939f810WKj6z9IDZl8Gne8Lv0+vEdsBp+3Ar38Q/H0oAUoluTEW1rs9xpSfKKS4XaWEH8q06k= 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:29 +0000 From: <Anna.Schumaker@Netapp.com> To: <linux-nfs@vger.kernel.org> Subject: [PATCH v2 09/10] NFS: Clean up nfs41_same_server_scope() Date: Tue, 17 Jan 2017 15:32:04 -0500 Message-ID: <20170117203205.29033-10-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: 0c34e3d8-06ef-4602-f038-08d43f17f54e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:QWquQ1rmrF94pFW+4iH8rnM39EP5rJTmSQfbTcv/7IoeERSsgVZgl3xjerkdj+vNY3K9Poq/vl6sk0kFWrP/A5BdlsL/hMw9Vftc1jDbSOWilBBZGsJbypMmZPpxpzHR63Nl/1njsmcH+B2LWLvYzemD7pXZ54v6DiCH1msWjgZz8UVrT+cucLgm+wXNC9E89C67+oSv43NDZJzfq2y2UHUxIgi3nPkZ2oZ2x42DOABqBl3n0tHCKAZUb6ZAarSOeuHO2Rl/T8r4uLQBtFzQKg==; 25:hQhH9OU/k7wa/tLqFjRyyWeiXxm+OIxcm7/HnodCjLRnCNwrq3rpeAamAwhIIsWDUnx4pQO+zkdwGOp8fYDejCSZEAX5PkeET4Cx5KqzAJWtGYHHa5/pi6N4MHRhQX7YZzdBNV5yNhaDN9YCnp/vzfeO2VvCE5eP+WsuvFxnrQvwHZX6cspaRrvR9uryRkIpM+u9tuctcJKs1iJ7tMnO/9O9EY6+z1Yc6WSqvvan1AMzYpZHY7uJfuQO7tvV1VB1UrgDEndwmdAPduuyOZl6nZGIZNL6/00oEuf768zc0Pc1PfCAeVJEHN3KE/no9vo9Epah87urbpdx29lxYjfIX/oo+esH6KCG4BuARZN7rAgcnAoAqiVkNoKpcT6W108UJkYoSRHa7qdKQUJy8HakAXXkOx0wMxJK2WJNAo545DD6QCMZADBnpoy/zo4mQvpzdwrPG2NFpOy24FET8ABLRg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:pg9e4PuMfC87tHiiXkJ8XpGezVeHQqOPpkMauNcotEhqqsTRZQCFiOaOvqNaGgt7EmZFDvxthp4gEDv7zG920QXk+dLlV0dO9yBS00LuXLx9UFto23osz3oMAbHyOseG/ImZgJDUyPSrq4L+DeHOjhzfcx6n41EclTHlJZkRQgeN1oRaJSKenoUZubZrBZEUEtWE/N0VrjfMta9hfQugJsJNNnAMTfMIjUqfYaB/m5O15J4KSnVtn90pfS29QyIGK5s+hudpZ8SLBR8h3osq1w==; 20:s15fl7kab/mFWuFkCmAR2td6IL4YmcXLMjB34Pw+b6zRJkBrVonzIoulHb5OY2KMHg8fGd0kA1BBAmNpirXIFqk89E9AFYVglyRWg3QURqZhP5u53Hdr1/5OdgXTorY9JAEC186Fly4PonU0oOHDDyKgHYEzc12sT52aVsS0SjkZPyCd2hyas8zozACv2Lrw7qwE64/ZKIvxFEEqjMQpF129c0AKG8YWluOyA7ueg7/TIepgwNCBsR3/+dfi+4McxevXGCzJ2gJdgd8bNNwpe4AX7SRZk2az/oqatY/RihlrW8QQUf4Z4cNLMZiylzw1SSDtEomFtVFM4829cHv1n+iAT55a6Aw6i3y/yQKiUdKxCR+IW3a/FOjLHU9QELy+5R/9WUgW45yUOJM7MxPIA4vXZHe2uv5vJWB3QIavF+yMWrzCC2rlWDTUwMAxlhr38mGUwttxdvzK9HfHdHAkqt+EuL1uHNZGSJoRROGBLLzl1wgMHVpKbXr1/Xklt60e X-Microsoft-Antispam-PRVS: <SN1PR0601MB1646DC10949FDBB476889E58F87C0@SN1PR0601MB1646.namprd06.prod.outlook.com> 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:+gGqUjuw03N0+QOJD1uJw+QrYnnsvrGlwy1DH5T8pxnv1BxbWlJuL0OCcKlOVpIa0K6bhOaRbqhkoylqR6WHx5iDhey0FDcmQg8OnLqVRckPhI6rgj+y3fBF1aWyn4lVJSYjSdgvW3RxL7ti2I1TQffyVGMXsPImx4dhyovg6ZF5auQNkd3gfHHtWm9zRTtoL1Rz1jQcb3YyEwGY/9MNuNU0r9wusa1e4n31AGmztrFq3tXUJ7ChFrtXNXgyZ8GgwlxyR9CAfelSoJMFTwjfraVIvY3hBucyM+YnGgUifgbn/CDpiILfVEbR1pmpSAk2RiuFusTK5M6PPLfoZyo6isE2swy5CA1TXAfU2ytX8PV/RTJMvhBXLN1utMfYJLKnEDhChM4TXyWmmD6wP+s8pwHNtTGoWERbgxnUSg8Y9DTo7lyu9U//UfV9Nqkvchbg7cp5cCps2CCmyk1qN4fB3ama9o/p9+kEOHn1yLUu6B9CcBc4VML/WfTTJePOOGCpfpMrsnUsIQFBlu6kIWXpQJe7CAPSRSrcAnfeVGVUYHlwmFqI5qJzK9q/EmgjLVnFxFijC5g2VELUmpKgU7I5JbfNQQ6EvU2QEc3FQ3Mhcj1hzgIbsAOZRRhq27OUN0/J 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)(575784001)(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:vz4NMB5n9jh1bjpsV6Ea7Rd39qtYHpqufLHH6C8?= =?us-ascii?Q?X/LUDHthQxeW+W6buH//NmEH7O13IX9vkinG3edxT8gXOp/gatd/O2Y5xvps?= =?us-ascii?Q?vZiF0+YEw61lypVL6s50cBU65ld3KF3X9EMBLM451rrxRlJjCAchfCm52jbJ?= =?us-ascii?Q?/pLk9RMaff+lCEKx1OkUIKaa6CaqR6bteOyE+DamtPd4vQ6OVeInRAQ8wy0W?= =?us-ascii?Q?tIfRxQLn4KU7ievRpYku4VMuaY4dZo9ZCeyT5ESZQlnE1d5J3pMiXAgdeYcT?= =?us-ascii?Q?hFVkeiWBVB5IE5LxQljmxuPwM5pMcn6EJuHFQnf44S7zB3lUbZTnwcKZXq2T?= =?us-ascii?Q?WBLXokjMMgmGvcPaGCidGQTcVAAWc5y8WMFEakVrMg9Z8Z/sqQJz+hXkQzcd?= =?us-ascii?Q?IOHFQoweWA1lboEJNKnqCI0mTmG2xuYy6nvrX7PBLoHPmXLVT5t0ynlGJ16k?= =?us-ascii?Q?CaYAnD5Du948L+g+TEfYt2zziM5nOaWbPuzcs54IE4HydQbuYzqNig6SY1mH?= =?us-ascii?Q?KdVE19VRhhM4RMDaJHxG/3zy5nNVITbi4EADuTlXWZVq/baCZMbgSsSPglHK?= =?us-ascii?Q?S5jUljHdP7K48lkStbY/4gdu6vX30453pj83TocbvxYLRm7c6TYy6ZHLGHCl?= =?us-ascii?Q?N0T+BR6qdF3fl5T/kKZj0KcCL7Ev+U1mofJWws+W8z/Fr4nIyzKS6voD1SWE?= =?us-ascii?Q?T5sj0nUYsWjKd0BnTkHIRlUPxlswNfNb6gJQW74h3A1k9hgY9tji+V+PA/1H?= =?us-ascii?Q?CrtQR+M60hpf5iNjeBzamDza8N6kctDb2zguKfN1rUZ7Zt4E/h7+uRQ07xeu?= =?us-ascii?Q?CbXKdKdUGWbQC4mkGogBgOY4zEaNCrYi3YcyLOl3FleyqNOBnKdLUQQk5Wx5?= =?us-ascii?Q?Jjyp2Fm0Q6UMZd9ikNYsvLchDUj8PGGrh9FgntcYAuTL+WSsYDleTSaQCEZD?= =?us-ascii?Q?Z55Q/XcHgUIYLqyjMW1hvXUqQ47HkuDob1wpeFqhsxPQLtxyg0CjlcvjJ5Cc?= =?us-ascii?Q?GRJKGZs1a35K/0w956O0rIvnDlrSkcGd312orI/kXliKHV0LNTxVQGB6f86e?= =?us-ascii?Q?zq/8Gn9ARMWBgMCpolM4cJGNB72NeAlFFVCwxXvzu+5+GNS4lKeCyLscX6KU?= =?us-ascii?Q?R9k1YZ7ZwUl/zA5aT7vsex6itkMhmOy3W6T2oLP9ynEMV4VfqrVBmBtGSxtP?= =?us-ascii?Q?IAWt6Yri+xwB5wwRCxx2XiCXm6ABq6LL3n0Qs3bvpD8SuhNLC1yuT/BbA/Q?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:pPPBRmOpRtBuGraJp6J0W8aQrtLSHXXRgXvJMXEFEvUL1lInbLrgSPJYGxmXaTDVHvNAWRfzPZ+XkPutPVWJ9fWcJQrLEngMIwgTA5s+ssZI/7px6uG+h6tDVmsiKtiDOXaPKbz1qQvdV2ywWF64B+1livXFCANBukQan74bxpx8/Os+2+3ULYu8TzfgaaN8Aw23tgKP44xATVP7V58xf628pACiAOHT46wGHG/b6UURmQJ6G63A0Yib7ehHk0EIdPRnsH6orH+Bx4zo3n9Adxpw7BpM8wRFQF78f9cmHvZBV7PA0Mu0Ki7YbCdOQX8eizvZsJtzHu1W+WLnH2SAZum1mFKLyjquJaXtDUpHCow2V2ACkOSClIYRdDriV7Wn+kKdp31Y6LN8lc7TFOLSvhoGAE6e4Ebn+vVnP9BDHvs=; 5:THqVkHUluh0qxGVhlOG7qNNeknvQ9vJ+j98vVVVLO63txbjuSIGPgqKx71x54DFVbMRTD6Rno17Wa9eheAFSERaXZaeyRyguPk39P2bGdUzklkjEkQIIeqvU3wfBbERfbDD/agdgxOsXbQ65/+fYuQ==; 24:qjHZUaiV8+Yse6xM/0RwXQeX2A5VDdR/Vt+BykzjJwYySlpFisGDbKYj4LNvbMi4gFZkiLLgg0jb/k5ZPNTyMm3JdOHD8EwqZkSlqrl0up4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:4wGuP0NvQx6v3LHIbJ4ssEK74ZwN6DIiSGUb8Ohs6Dhfv67YHrhQ/PpB6mpcQq6rT0UxGIktMdfNE17aJ3Okv4y1aB+67bwGHvT/1mI/KlMnFtNdRhkEE4PjN1LzHi5NKWQldybjhcH2gqiyGfYaLapGSOiNAxNvwijouySqegDyEbLZplqAVp1Nh8Zm8Ooy+UoD6tzP6+s6z3nvw09mHFsXzfttdVBBq9E04fYR/gAneo9/Xd1zeAVWI9ASQV/sUdtsFKXfYYpvGQ7Se6sCnfVJW5GbXSsXcS9ZJ1GgTmhk4kl0YQzlkpF7uVMnPl5tLIBp/9mmT9adXIbM2u4wZAqykS6y4C0bM/trnqPWHaCCEO/yB12fo+yUbJZyQBc9U4lx0z/EEL1YY9i9H3G7YT3y7bTp8Ou3Ju86ow3jtUTArs1mRBQ4DWIsiepIElE7b3bA6p/KY7SucZGi0IO7wQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:29.3456 (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 c6d0a93ca652..8395432c6fb1 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7112,11 +7112,9 @@ static bool nfs41_same_server_scope(struct nfs41_server_scope *a, struct nfs41_server_scope *b) { - if (a->server_scope_sz == b->server_scope_sz && - memcmp(a->server_scope, b->server_scope, a->server_scope_sz) == 0) - return true; - - return false; + if (a->server_scope_sz != b->server_scope_sz) + return false; + return memcmp(a->server_scope, b->server_scope, a->server_scope_sz) == 0; } static void