From patchwork Tue Mar 4 19:05:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 3765321 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 797F49F35F for ; Tue, 4 Mar 2014 19:05:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9FEDB202FE for ; Tue, 4 Mar 2014 19:05:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE2D2202EC for ; Tue, 4 Mar 2014 19:05:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754944AbaCDTFs (ORCPT ); Tue, 4 Mar 2014 14:05:48 -0500 Received: from mail-ig0-f175.google.com ([209.85.213.175]:41458 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753269AbaCDTFs (ORCPT ); Tue, 4 Mar 2014 14:05:48 -0500 Received: by mail-ig0-f175.google.com with SMTP id ur14so5919146igb.2 for ; Tue, 04 Mar 2014 11:05:48 -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=fNRJi0Pwb5VmwJUqYlQ1WxLzvZwl30CwZ63T4aOsixc=; b=jmiv/NtRky29c3hrNVmCDalYNg1Yljt2+BIY5KufZGNmPTERyyBBDuUePwr8XEfjua pUGOeKnJrh1YpRLU33pPDMFpxPQOUv2GNQ+US2c246KrnOvCuNCnChv8Pw5tXzr4vcwz 1QBF5gI0o0+ezFb+6PfEnGhbZyJNZcvV6HBksDOKXUAf9kWpEOiCEb8TcjYfvPZlKqII EvCUd1wKbAdCfmC2vmFOgXlIF1uaKQ7Mhr9N7QPPQrpROr9sMt/+1FBXe+oP3K/oROXh SL9qdAWZeyNamqjKo0MjTFj1B2xfrn4IkoaY/VWKb9r+u5s2kQFEt69JmYu/eRh2JNi0 aUbA== X-Gm-Message-State: ALoCoQmLt4EZTi1dURgIfO2CPRIHbysj3qXlVas2Tm29ZLwlZK8G123S45tg/1TOXyZB4YV+tH51 X-Received: by 10.42.228.131 with SMTP id je3mr915976icb.59.1393959947936; Tue, 04 Mar 2014 11:05:47 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-98-209-19-95.hsd1.mi.comcast.net. [98.209.19.95]) by mx.google.com with ESMTPSA id hs6sm52631478igb.2.2014.03.04.11.05.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Mar 2014 11:05:47 -0800 (PST) From: Trond Myklebust To: Andy Adamson Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 2/3] NFSv4.1 Fail data server I/O if stateid represents a lost lock Date: Tue, 4 Mar 2014 14:05:42 -0500 Message-Id: <1393959943-9919-3-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393959943-9919-2-git-send-email-trond.myklebust@primarydata.com> References: <1393954269-3974-1-git-send-email-andros@netapp.com> <1393959943-9919-1-git-send-email-trond.myklebust@primarydata.com> <1393959943-9919-2-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 From: Andy Adamson Signed-off-by: Andy Adamson Link: http://lkml.kernel.org/r/1393954269-3974-1-git-send-email-andros@netapp.com Signed-off-by: Trond Myklebust --- fs/nfs/nfs4filelayout.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 12c8132ad408..b9a35c05b60f 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c @@ -324,8 +324,9 @@ static void filelayout_read_prepare(struct rpc_task *task, void *data) &rdata->res.seq_res, task)) return; - nfs4_set_rw_stateid(&rdata->args.stateid, rdata->args.context, - rdata->args.lock_context, FMODE_READ); + if (nfs4_set_rw_stateid(&rdata->args.stateid, rdata->args.context, + rdata->args.lock_context, FMODE_READ) == -EIO) + rpc_exit(task, -EIO); /* lost lock, terminate I/O */ } static void filelayout_read_call_done(struct rpc_task *task, void *data) @@ -435,8 +436,9 @@ static void filelayout_write_prepare(struct rpc_task *task, void *data) &wdata->res.seq_res, task)) return; - nfs4_set_rw_stateid(&wdata->args.stateid, wdata->args.context, - wdata->args.lock_context, FMODE_WRITE); + if (nfs4_set_rw_stateid(&wdata->args.stateid, wdata->args.context, + wdata->args.lock_context, FMODE_WRITE) == -EIO) + rpc_exit(task, -EIO); /* lost lock, terminate I/O */ } static void filelayout_write_call_done(struct rpc_task *task, void *data)