From patchwork Wed Mar 5 18:30:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 3778381 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 3D5B6BF540 for ; Wed, 5 Mar 2014 18:30:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76B052020F for ; Wed, 5 Mar 2014 18:30:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D41C20225 for ; Wed, 5 Mar 2014 18:30:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756388AbaCESaV (ORCPT ); Wed, 5 Mar 2014 13:30:21 -0500 Received: from mail-ie0-f169.google.com ([209.85.223.169]:59324 "EHLO mail-ie0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752970AbaCESaU (ORCPT ); Wed, 5 Mar 2014 13:30:20 -0500 Received: by mail-ie0-f169.google.com with SMTP id to1so1518765ieb.14 for ; Wed, 05 Mar 2014 10:30:19 -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=GLJWoVQP56lhm7reAfGCPNj3GI094GymdLagijzo5xHCNTUbNPkZCC76W6mmEe8KEM AYbHZEfQ3+P+kQ0PYAUfIqoP/gjU+9LOMj91KYaJoEcRdh+eTe01bs7gfBVdlnU9Ib1q C6W6T6GhAKARDUSivUCZhpC4GykW8V40Jy0m6bWjt06EsChaX7oY1D6xffU6iBtuyozO QmneO8LAIuAg19ctFSnwCx7o3wkvhYEvTjmJViLgJXE7UkcR9AIA01HGJzU/Fq/LwDRf COLit6I7eijeTaDzOxmuv45l2FoLlknm4V7Rcg0fvCRLkGLukqoaASFIkz6XQwVaO4wA eC5g== X-Gm-Message-State: ALoCoQkvWZVFndIU33wFk8zgx7yFbGOR306YKg1bR/+ccuN/pwlQ85otH2ZqAxu1TdA4hmbmMO8R X-Received: by 10.42.61.4 with SMTP id s4mr3140003ich.58.1394044219852; Wed, 05 Mar 2014 10:30:19 -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 gd5sm15729716igd.5.2014.03.05.10.30.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Mar 2014 10:30:18 -0800 (PST) From: Trond Myklebust To: Andy Adamson Cc: linux-nfs@vger.kernel.org Subject: [PATCH v4 3/4] NFSv4.1 Fail data server I/O if stateid represents a lost lock Date: Wed, 5 Mar 2014 13:30:10 -0500 Message-Id: <1394044211-22302-4-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394044211-22302-3-git-send-email-trond.myklebust@primarydata.com> References: <1394028452-15956-1-git-send-email-trond.myklebust@primarydata.com> <1394044211-22302-1-git-send-email-trond.myklebust@primarydata.com> <1394044211-22302-2-git-send-email-trond.myklebust@primarydata.com> <1394044211-22302-3-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)