From patchwork Tue Jan 17 20:32:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schumaker, Anna" X-Patchwork-Id: 9521891 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 777F96043D for ; Tue, 17 Jan 2017 20:36:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68B09284D0 for ; Tue, 17 Jan 2017 20:36:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D54A28510; Tue, 17 Jan 2017 20:36:15 +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 B760428510 for ; Tue, 17 Jan 2017 20:36:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751243AbdAQUeA (ORCPT ); Tue, 17 Jan 2017 15:34:00 -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 S1751137AbdAQUcx (ORCPT ); Tue, 17 Jan 2017 15:32:53 -0500 X-IronPort-AV: E=Sophos;i="5.33,246,1477983600"; d="scan'208";a="165683718" Received: from hioexcmbx08-prd.hq.netapp.com ([10.122.105.41]) by mx142-out.netapp.com with ESMTP; 17 Jan 2017 12:27:08 -0800 Received: from VMWEXCCAS03-PRD.hq.netapp.com (10.122.105.19) by hioexcmbx08-prd.hq.netapp.com (10.122.105.41) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 17 Jan 2017 12:32:31 -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:31 -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=kfCsfXjHAdVtkyqhQz7clpimOyJTmd6gm+p930ozrHA=; b=Wk/ZuPjYC5uuI1tilhis/SefEZjjZIQm1kxgq7ULSeDtY0Rnpx6v1nTfrAuB0Y025GPuGHt/QV84P9+Yc6a5rvjVQ2Gtg5cczbZFxdIlrw8JEBTQa1Rl/5+WU+JubvPa1jS/sPbf4OBTSb/EpE2evZmxw7eG3q8uGk7UW4PlPgg= 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:30 +0000 From: To: Subject: [PATCH v2 10/10] NFS: Return the comparison result directly in nfs41_match_stateid() Date: Tue, 17 Jan 2017 15:32:05 -0500 Message-ID: <20170117203205.29033-11-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: 87fd7432-9f52-4795-a3b7-08d43f17f5e0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0601MB1646; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 3:SCBVpEvo5Ydgr0HvBWg1TvfJKXws1FNjqoYftGMOiqkFB8tsB6f8zeUjIx9y4fi4RJSyhrRpuRA4qoKMHa1j944mnilxCKZ4qXhDAnchb2EOPuPZf7E8PwAbYMQTdKGjan+Q9MgLYquakG4qCjAhvKw5vYFcaj7mS8uHW/5FZPt5LKfXZnM5RBQfctCCBbF6I1R8gqF2xdB3nemkR8a17whWeriUxN1DkrSno4lwgebmO36cNELxlgqCTSbGEnrA/3kpJk/tjHLqO7PbsLVmKQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 25:N24yydYReenQ8G0bfbOn1O3ziPJmCbs6GJBFtY0THmbmyf0pFoi2ZOMJAeYL+yrs8seWTw/1z+pL6uq0FgCZ1Pv1Db4QtawYvwzAbwomfOfu/0aYtlG8C9FbRWnVBui9ayQR8xqMmccoiKQl3q77iy63z731BZXZm/HvffFdwoPQzeweQ9vjCxgRM/2q6WBrzVaVcET3oR5kvIPV4zAFxdGoQkAoYxNsh83yH6c7DnNbb5Gk+vqar3HZuZfr0ylKzAohpfFZWu9TLJAaSTHfka0AydIrjYj5n4gVVeRYb6UJf4WF0q0gkXnKXnJTf0+8RRBSTA2IJcWhvBTWH046OfgnQHMwT2YNSAcqJLUdHbYGTUB5QFx6dSodvnij2kosopu35dYNJvfSOtgVkIzUUF1bpLd+Wqb+fM4dff57nx86WvPgHKL4z3gFvJgo6MGeGLh0KPFIu9NxSuPEJxrO40q1iVTR2EMxJv7KU6JyoATjam5Gk60vN/WE7EMhaQTcYYP8lK9P0OQz1esdXmzssYoblvQ/Sl6O81u1t8XSV/ZzyPpvCncz9lee2uweJP0SsU1XXp1pLC+buD3Qi7UK+OFpt8QfTxaXvO/tJH6gnXIbD2nnYq8pv+Hc3zMolq4oUTJ8bPCUU6mXzmrExHzarQBjaGebxTceInwc/KwhNmdrrtqd5WmGAYvReXjpbQdPngP848qSn8oS0zTIbMKacXU+1dhgzw6OExl3OMGZYfcr+UvPGNaSs0KmK2PEQkzN7mYsUQcnLqFY5TI0r8RKBCMJ16+bK8VY0SWzjphWrgk= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 31:Z6zwsTptRCaWh3Mvszig9vMw6OyBM701Y2mwCfnShdZKYYItR/eLZUHhx0Xh0caaM6YaeP3DZ46Xy4+3M207ih57XNG5ZRht8W72Ap33hqhSVg1nB5pg2kSYA8sXoxlEAI86nJ8L8Y0KZY1b1OYPfPO7XAUm1aj2qW2/WjbCiWzSO76KXuno5Y3n8vF/yd7FMBi7QoHUQK8tLsRVbK1jzPzI0S5yYe9K81TupYXuWq8O3YRsNXi9yiw6Oj0bND8IJCslIpja3a8PnePdQGF9Jw==; 20:rWP1BKnwBGBZH9pYW346oxBcXo8mIzFRHnOvV+QsgbB6Isugt4pM5IAFkB5XoQdZ0NE6nOf8KYOhdrR2RxW9GNhvcnMH5156Z2mtIFpAmE6GwOup969IQmpfOUVJ6jgXb2F4y0HFQ4llEJxC8Wx59/Z6A6fzUe3wvQO3IFAu3bYckFWL+55ZRdSKd3wSv8cffqNJM4wZnc+J2kAZp8SJgme93fTksy76sXmQmko+FP5cd0waUzshcqU1g5MDD5TmnacWqq142TCWbzLf7UvKdWvGzAoqYDYSEhl7gZ1YTJVRKZbpQYKafDN+CXpblCrfTD7t2lXenEcgRyC+zDG2++OwDq1Fu3yVy8F+auGYYgx9jqa+HJWLpAM5GpLcFNRU3LKj/Kq24XHvRkh1aqqSurYvGUJl4ObN1AC6rfg9pjI9RpU5y6nGTuFHBaveuiAZHjZua7lJi61gvB60OyuuNyWLYNvGt4ZVPSdMmh+vpLnq+U0AGCDRCrGeiBwuvTTN X-Microsoft-Antispam-PRVS: 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:mQBV2rEqzDmXDvRGet+imY85edepbmy2zbpXD/uf4HH+nMc4YLZbafeQSW9CzICBfdQJd7tOngOVX/uVYFVC+UXA835ccC5hgOLGyNOp3D6J0uYdey+CAXMjWT/YsESoppi569MnKEQCgSCjRgdTtkbIl5DTlK/QgMQMSgoi5cfBVypnn6BNs5PdZvSZbGeeg767zD1c2tCIrllsdxoAD0bhBukbC76SWQLHqh1jxvv3Zm7qUCsqquUCWAY1Td+LMttLYOnRqHka+hzcMDjy8otg57y4qK28+jtojJjFRzWGeRohfrNcG4cKdJGbWlcMv1fo99XHZpzrC18F+gbo/kmDBau24SBtyQpMyuvBMapBQuqdFtHQg8FXk+t2xV+eU9VM/DSVGlTdgjE4U/KMCMjw6bHF82UbBpXPXftAA38A9XK6HecZ6UNCjbCxxq8tCvoMuqO+oOdoxBRBUCuQyPhXGcPdLfenXu344hhFhIT9RXjtgk8HMXplBLIEUxR1i9dxVDD+1tnUh4qGCcfVYLVj6VVHbCCR3K0R0LlduvAV0gliHLxqm3KjTI366Ro7WBMGo14UX/iq/jroBHYkXw== 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:2RVYvhpg+Phz4Bm2f7IxohltpDSCiYWzLCdQpFX?= =?us-ascii?Q?R2yzJp81sUF41ImeK1GgXgTDl4NFpQXxwufwOBcOFBMQP/AYn+93w/tgaInq?= =?us-ascii?Q?1uMT+EJ7NNUXkDjJc+rySPkjc40wB8FPmznJpk2UqzudAVys66SK1bNxlgam?= =?us-ascii?Q?ITPIkYwHbQMKZqVvTKvzB1xx/DcWpDZWsfLejxicKkPpcqfRRcqK9hIHdcIa?= =?us-ascii?Q?rX70PWCrICrf/ImnJuOxGlc8EJsDU9vXXrmA1OfikvziOXOtq3oI8qbw98bR?= =?us-ascii?Q?Zq49xAugLE6UKWggeKl6ldk0RhjIKadtlEudF6lLzu48a87RSAnnpLFdpO5b?= =?us-ascii?Q?EmRjTYNG8vfxcnGonXv4rQNkGd9SJqRXqssvAcM/ia7RncPvlAqe4PuzF+Iu?= =?us-ascii?Q?nWNrxrgKUn7+BmXfyD72d6Fh7said//3iOJMgMBz/5eS6ZAezfSWHBoT2hHg?= =?us-ascii?Q?XCPUmsEvWXY+/WW9kblpTdqu0uMbWnu8Mo68aVkRF18Pj2k//CQ8029UBdeA?= =?us-ascii?Q?6Brv/vpfiVgbu40yWPQwWd8G3H6vJP+C5XgcGiQIguGSc6opiPtGFqZwbfjC?= =?us-ascii?Q?aO8bHIcdkFCmO+CAhccRMnkR2jIi9UA4wOJ72oCfBhKj9CUBW1OuQtn282/B?= =?us-ascii?Q?SN+Ejde90pe7wHulZmSKjHq260E46EQFM81tvOfpcpL6j+/xQbJ7C11bhppd?= =?us-ascii?Q?QDtjRVl+fu2EZJSmM8vZ7bzhBpSRf2Knn1bR93iZm42QMXd4HnsSZsn01RBu?= =?us-ascii?Q?KOyV/bx+1oeHv6k4MUiwdV2bAwvbjcZ7VycKNIlPkhYxFGa6EJXNnc9NNAr5?= =?us-ascii?Q?GSrl4vE+DdSXoguu+irsRTL5vI07bmjCPXvbkKWfugvbkwGP2fBdw8z9gbje?= =?us-ascii?Q?ha/7GRqgV+vd4cw+Q1No5BmKqXeBlxKpCJ5WvcLV+NGGjvwl6nnG49fMkoDr?= =?us-ascii?Q?oO/qFhCb/772oTVwHIiOtOktpjqQXEUgJ4UmeLi9tljehJmkoESEG0FGkD2m?= =?us-ascii?Q?QSxDlvxoLUd1+2LSJMI44vbruC9DXOhvplivJjLGp5uBIaF+dgQlYltw0zNB?= =?us-ascii?Q?BUZsx/MjGjVILHH8tX82Yn5ChLyOaWBl675xdPzNZXjIefj3FTpxGUk+QB16?= =?us-ascii?Q?Ol0wfFj8IfI0Gh1Iv/7C7XefTWLjAAfj3DIEXu3Og83bxUi5w13gGHzZNb+k?= =?us-ascii?Q?bXw8GyW5NDywi9edm2Dn7aVDo1wUUtBj/948P?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 6:aH4UtMtwTwiqAoU90XQLFso8VF/m7tUo6CPET4QI872DEfd5CppO3kZZ6Imzg29eh6PQAlUM8JPcEuEDKhGX/VwO1/16WwV9fsrtXWy6GSEybIjmCjUezbwT+2ddYPePRQe6CX+7bvVpfV5IEfNRtOXjjt11jWj7K81CsK3uBblx50gw7qfeFlVbliormR69Xz9VPIuadH2Pftl5IHJWgM8a2CRrrCxxUzDDUw89+itv+rPHK9n0ITGi7Ifvy1hXEfpWtIo4+kKwkSJlMrnJT7oWPJsb1hjTXB2LeVcmvi0kXQY4RX2MsZWRoDICeN13qT3wXrt+ZfIXT9eKnaXlCrs3tZcX3cVLX4XF5Oj3nTXP/k30ymmHw1r2hBu9lO3A6pGObOkcdlzO7sRLZdaPVSrzwJO6iIihYg0+h/t2DuI=; 5:gwlrLTXRA5QXY2evStolVRSFLRFghvpwOfUcmRao5Bm/cDSy5supQ1sOARGGWShQCURAlelF+aliG8Vk+T2qzxQlvZhAUDlwu1Kg5qEz7s/3bqVV3aaJds5VICHyDyBv9XS1JHfvO1tk4E7aw2aSxA==; 24:Sdns6HalJiibY0KM4eg5LCF9NRvStW2FmCqH16tMqaYYbbnKd8t4E6fE/3qvaW0r2Zx6zvuSROwZCTHnRZKfH2KCwT5TCN7GYU4/C6uiuw0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0601MB1646; 7:fOeuEhKUht8ko2o8uDVOQ0YDa/eI86CI+zqkUAVt6MKIJ1ua0sAeLcSz+wYjsccRdOtw0ghg+JvJVTvbFmCLW5L2VFuWkxukDxWAQsbQ6NNNiz5noaXNFfT83x5SH1/mOb5+1nTN+34IOytuQhlSPwSDSKxnw1YhR+AjmD2/+GkmQ3X8YrAqSc5kcJcAQipTIeyVZi17sB74ulCFrgttnr6Gwke/JXHZXbdqFpaKcs2Ef9rvNI7eRnC29cCKi/JG6qW7II9JWfPOPXKDJOnPvR5qRDLh6+nNCr2OhVC6m7vpgtGIWO3E85Fg9f9SeEeaZU5t+z/fbXI4bITmtlpPViVMdvLG69jkNqJiiK/cvAbi82Jwllk8RF1sCrqXiexav2B4//PG1XgioinFcrnKXihiWpcQzV7srcmC4msobKf3drToa3eTlERFJAA/VsMG+Qo/8xvnd879X8+w5VAipA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 20:32:30.4547 (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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 8395432c6fb1..06190beb2c52 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -9107,10 +9107,8 @@ static bool nfs41_match_stateid(const nfs4_stateid *s1, if (s1->seqid == s2->seqid) return true; - if (s1->seqid == 0 || s2->seqid == 0) - return true; - return false; + return s1->seqid == 0 || s2->seqid == 0; } #endif /* CONFIG_NFS_V4_1 */