From patchwork Wed Jul 8 18:25:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 6750551 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6A659C05AC for ; Wed, 8 Jul 2015 18:25:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A22A20629 for ; Wed, 8 Jul 2015 18:25:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 915322062B for ; Wed, 8 Jul 2015 18:25:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758685AbbGHSZ0 (ORCPT ); Wed, 8 Jul 2015 14:25:26 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:34615 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758312AbbGHSZ0 (ORCPT ); Wed, 8 Jul 2015 14:25:26 -0400 Received: by lbnk3 with SMTP id k3so61427538lbn.1 for ; Wed, 08 Jul 2015 11:25:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=fcXP8IIKcZoNUx/LxobqpScXXVrLqUVOr0PiH+9ksC8=; b=TtM+toi4tAOoOAM8pee5gIJme6wn8KWsBwLN1SEu2YEJEF/fFINT7z9hYH7oCHJP0i oAmH7a/SGVrbhbHPhcNlOAvkmNnl/Hq76RuA+dDELW03yVv+Bu8kvf2oNKn/6PMfDChm zj79coBElqJz0AMxR3FDRs2pZqftEHkzo+eBLAXPgWeuM3dj7jza7NOiMnxN3AeI3OaJ Yqpode+N2ZcF6SO4sRV6LBokoab7CzA4qgmV11JNWuFQdnexfbMwDCqml3P+aE5RXQEs OHAHrXAxNAE/acH1NKiDWHPMLw0NVMx/C4WFqWQ314SyyPmST6RQe7aYkVqyc0rDg0rQ 8nbg== X-Gm-Message-State: ALoCoQm4yV3wOYFUZEgjvLBBidpbfheM8YO35rPi+mdFZdpkMGWcRmWSKth5IQZ3CilhiUIegYMZ X-Received: by 10.112.25.39 with SMTP id z7mr11129952lbf.102.1436379924235; Wed, 08 Jul 2015 11:25:24 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (2.150.13.127.tmi.telenormobil.no. [2.150.13.127]) by smtp.gmail.com with ESMTPSA id db12sm741878lad.34.2015.07.08.11.25.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 11:25:23 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 4/5] NFSv4.1: nfs41_sequence_done should handle sequence flag errors Date: Wed, 8 Jul 2015 20:25:12 +0200 Message-Id: <1436379913-3338-4-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1436379913-3338-3-git-send-email-trond.myklebust@primarydata.com> References: <1436379913-3338-1-git-send-email-trond.myklebust@primarydata.com> <1436379913-3338-2-git-send-email-trond.myklebust@primarydata.com> <1436379913-3338-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=-7.6 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 Instead of just kicking off lease recovery, we should look into the sequence flag errors and handle them. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 6f228b5af819..1607b41a6d84 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -616,8 +616,7 @@ int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *res) clp = session->clp; do_renew_lease(clp, res->sr_timestamp); /* Check sequence flags */ - if (res->sr_status_flags != 0) - nfs4_schedule_lease_recovery(clp); + nfs41_handle_sequence_flag_errors(clp, res->sr_status_flags); nfs41_update_target_slotid(slot->table, slot, res); break; case 1: