From patchwork Wed Mar 5 14:07:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 3774801 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D73B99F1EE for ; Wed, 5 Mar 2014 14:07:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C48420256 for ; Wed, 5 Mar 2014 14:07:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A62EF20237 for ; Wed, 5 Mar 2014 14:07:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752413AbaCEOHi (ORCPT ); Wed, 5 Mar 2014 09:07:38 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:51346 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751630AbaCEOHi (ORCPT ); Wed, 5 Mar 2014 09:07:38 -0500 Received: by mail-ie0-f173.google.com with SMTP id rl12so1049477iec.32 for ; Wed, 05 Mar 2014 06:07:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MThIfkZnsDuxRIuioIDsJiX9HxVwIRAnyrsKcZ3Xe8U=; b=hpFq2/rtmVxBkQ35scSy8ZTi3cBQAQNsbHNO0ndq3bras2qJWh7V4LMJqBr3aJ8JYp E/gugFfOEQ0GT6i8SYH7VSUKGAGXnNFCsyti4s4P7r7efxXjPINCxJVjMHWBfNxfjgns O4cmMTr/EFhwcIPJJodosbeOa6T7aQyF0xI3LDP3wSBrdx6y8GhseLuwi+GywHgRt4SX d0KT9SNSTr7hHUa/8rdxKftpth+cyUGPBbZsgqT6dRmjRAhbJo0XqSW/mfdjhXdLf9L9 I4AnPOnuIl8JMQwuDTUvAFX35wsYTbH8Q4Rw1N4t+zA1FD9lm/IHT7MJl1k6hwKjyHxj bVUg== X-Gm-Message-State: ALoCoQlUkz51lHbKIOH99JafnFXK0rCC3OnBJP9oiUU12POZEzRkbYWOVuZC7L7QX7/KTLzf+HYg X-Received: by 10.50.11.36 with SMTP id n4mr34698614igb.3.1394028457572; Wed, 05 Mar 2014 06:07:37 -0800 (PST) Received: from leira.trondhjem.org (c-98-209-19-95.hsd1.mi.comcast.net. [98.209.19.95]) by mx.google.com with ESMTPSA id m6sm13682148igx.9.2014.03.05.06.07.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Mar 2014 06:07:35 -0800 (PST) From: Trond Myklebust To: Andy Adamson Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 1/4] NFSv4: nfs4_stateid_is_current should return 'true' for an invalid stateid Date: Wed, 5 Mar 2014 09:07:29 -0500 Message-Id: <1394028452-15956-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394028452-15956-1-git-send-email-trond.myklebust@primarydata.com> References: <1393959943-9919-1-git-send-email-trond.myklebust@primarydata.com> <1394028452-15956-1-git-send-email-trond.myklebust@primarydata.com> 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 When nfs4_set_rw_stateid() can fails by returning EIO to indicate that the stateid is completely invalid, then it makes no sense to have it trigger a retry of the READ or WRITE operation. Instead, we should just have it fall through and attempt a recovery. Link: http://lkml.kernel.org/r/1393954269-3974-1-git-send-email-andros@netapp.com Cc: stable@vger.kernel.org # 3.10+ Signed-off-by: Trond Myklebust --- 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 44e088dc357c..4778c55d0336 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4011,8 +4011,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; + if (nfs4_set_rw_stateid(¤t_stateid, ctx, l_ctx, fmode) == -EIO) + return true; return nfs4_stateid_match(stateid, ¤t_stateid); }