From patchwork Thu Feb 27 22:49:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 3736741 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E2512BF13A for ; Thu, 27 Feb 2014 22:49:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 128F720237 for ; Thu, 27 Feb 2014 22:49:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8598E20136 for ; Thu, 27 Feb 2014 22:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752605AbaB0Wte (ORCPT ); Thu, 27 Feb 2014 17:49:34 -0500 Received: from mx11.netapp.com ([216.240.18.76]:41502 "EHLO mx11.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752604AbaB0Wtd (ORCPT ); Thu, 27 Feb 2014 17:49:33 -0500 X-IronPort-AV: E=Sophos;i="4.97,557,1389772800"; d="scan'208";a="105445308" Received: from vmwexceht04-prd.hq.netapp.com ([10.106.77.34]) by mx11-out.netapp.com with ESMTP; 27 Feb 2014 14:49:33 -0800 Received: from smtp2.corp.netapp.com (10.57.159.114) by VMWEXCEHT04-PRD.hq.netapp.com (10.106.77.34) with Microsoft SMTP Server id 14.3.123.3; Thu, 27 Feb 2014 14:49:32 -0800 Received: from netapp41.cthon.org (vpn2ntap-18387.vpn.netapp.com [10.55.75.141]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id s1RMnSGA001849; Thu, 27 Feb 2014 14:49:29 -0800 (PST) From: To: CC: , , Andy Adamson Subject: [PATCH Version 2 1/1] NFSv4 always compare stateids in nfs4_stateid_is_current Date: Thu, 27 Feb 2014 17:49:18 -0500 Message-ID: <1393541358-17277-1-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andy Adamson When nfs4_stateid_is_current does not compare the from the wire stateid to the current stateid, nfs4_read/write_stateid_changed can return a false positive resulting in a READ or WRITE looping forever retrying a bad stateid and never triggering a stateid recovery. Do not check the non-boolean return from nfs4_set_rw_stateid. Signed-off-by: Andy Adamson --- fs/nfs/nfs4proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 8672323..652e251 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4053,8 +4053,8 @@ static bool nfs4_stateid_is_current(nfs4_stateid *stateid, { nfs4_stateid current_stateid; - if (nfs4_set_rw_stateid(¤t_stateid, ctx, l_ctx, fmode)) - return false; + nfs4_stateid_copy(¤t_stateid, &zero_stateid); + nfs4_set_rw_stateid(¤t_stateid, ctx, l_ctx, fmode); return nfs4_stateid_match(stateid, ¤t_stateid); }