From patchwork Sat Sep 17 05:13:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9336993 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 355CB6077F for ; Sat, 17 Sep 2016 05:14:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2875529FAD for ; Sat, 17 Sep 2016 05:14:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D76429FCB; Sat, 17 Sep 2016 05:14:00 +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 B9F9D29FAD for ; Sat, 17 Sep 2016 05:13:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757661AbcIQFN6 (ORCPT ); Sat, 17 Sep 2016 01:13:58 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:33408 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756504AbcIQFNz (ORCPT ); Sat, 17 Sep 2016 01:13:55 -0400 Received: by mail-io0-f194.google.com with SMTP id r145so2386821ior.0 for ; Fri, 16 Sep 2016 22:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=oZQ2SBcOLV0H81rIXCsXewhlMnZ/MMK/iSZMXWqZfpg=; b=nVsyJrHMB46uiSKyBmEPleToYy+AhhC5AFP62+lNpa1Wd+2Y4i7DgvrFU8/tMZXm1u s5TTERhsy4inw80bBOwzM0/DSRhEurtjSEHozmOu76sJk7weNCBHqvaeAxUQeSjq8xEZ HWxfGZom+fiTgiEOpgck04GZS2EwNjW/K3b44CkzWhjNrgE5fmkz+3tOodXRYEv7G9WJ VXUPHxiPn34pAUM0d/eb6ShNC6Y58++uwXeIpPq+nE4/h3m1L9lMG6ueEXvBT0FO4iIg oTQVGYSInExxVaTcm9Eb80KEX4b7kVXAkM8F52iPzEpmIgSt5BM8K+ZwcHUhqb4NH/Ul OZ2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=oZQ2SBcOLV0H81rIXCsXewhlMnZ/MMK/iSZMXWqZfpg=; b=Hr2WrAKbKOT9bHpeXLIATxdYrvOQiNLHLbjqS3iQMW5uNM4C0WhS3X3YYlqdg/MMYs U+fMkJ5WZONjOhNxBCpBMxL2XWff6fe2b5MGfIZsARcq2q7mcxeFyUhrh4hjfLq3Pffx EtIQd+Rhx9FaaXJ14MumcZMLP0waZPoy1sMLO7ivVmdLCcu4c2QYq/hzoIm65ua7ruoR N75gQxDK4T0f8YTC3Zo0DrwAK/gVq7T5y2ixORJ6SWAyBPb2fjO5SyqmHiedah6pYfLA MVzjXt+R2isFdNrsjwruapnIycvokvHCyK1Kg3vJys2Bl2PnN+wqxYZPQ0xGTDzcjBPP Nb1w== X-Gm-Message-State: AE9vXwND/QVzivKN7xCBTMYkRf/6fNp1rtnnAfpXyjOJwYhPJu+vuKou4VETpLUxM/1Zzw== X-Received: by 10.107.139.14 with SMTP id n14mr10575171iod.166.1474089234996; Fri, 16 Sep 2016 22:13:54 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id d15sm4993916ioj.19.2016.09.16.22.13.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 22:13:54 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org, Oleg Drokin Subject: [PATCH v5 20/25] NFSv4: Pass the stateid to the exception handler in nfs4_read/write_done_cb Date: Sat, 17 Sep 2016 01:13:28 -0400 Message-Id: <1474089213-104014-21-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474089213-104014-20-git-send-email-trond.myklebust@primarydata.com> References: <1474089213-104014-1-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-2-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-3-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-4-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-5-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-6-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-7-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-8-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-9-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-10-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-11-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-12-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-13-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-14-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-15-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-16-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-17-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-18-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-19-git-send-email-trond.myklebust@primarydata.com> <1474089213-104014-20-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-Virus-Scanned: ClamAV using ClamSMTP The actual stateid used in the READ or WRITE can represent a delegation, a lock or a stateid, so it is useful to pass it as an argument to the exception handler when an expired/revoked response is received from the server. It also ensures that we don't re-label the state as needing recovery if that has already occurred. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index e2ab6f665dba..82449e578608 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -4523,11 +4523,18 @@ static int nfs4_read_done_cb(struct rpc_task *task, struct nfs_pgio_header *hdr) struct nfs_server *server = NFS_SERVER(hdr->inode); trace_nfs4_read(hdr, task->tk_status); - if (nfs4_async_handle_error(task, server, - hdr->args.context->state, - NULL) == -EAGAIN) { - rpc_restart_call_prepare(task); - return -EAGAIN; + if (task->tk_status < 0) { + struct nfs4_exception exception = { + .inode = hdr->inode, + .state = hdr->args.context->state, + .stateid = &hdr->args.stateid, + }; + task->tk_status = nfs4_async_handle_exception(task, + server, task->tk_status, &exception); + if (exception.retry) { + rpc_restart_call_prepare(task); + return -EAGAIN; + } } __nfs4_read_done_cb(hdr); @@ -4596,11 +4603,19 @@ static int nfs4_write_done_cb(struct rpc_task *task, struct inode *inode = hdr->inode; trace_nfs4_write(hdr, task->tk_status); - if (nfs4_async_handle_error(task, NFS_SERVER(inode), - hdr->args.context->state, - NULL) == -EAGAIN) { - rpc_restart_call_prepare(task); - return -EAGAIN; + if (task->tk_status < 0) { + struct nfs4_exception exception = { + .inode = hdr->inode, + .state = hdr->args.context->state, + .stateid = &hdr->args.stateid, + }; + task->tk_status = nfs4_async_handle_exception(task, + NFS_SERVER(inode), task->tk_status, + &exception); + if (exception.retry) { + rpc_restart_call_prepare(task); + return -EAGAIN; + } } if (task->tk_status >= 0) { renew_lease(NFS_SERVER(inode), hdr->timestamp);