From patchwork Thu Apr 11 13:28:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 2428651 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 16ED1DF230 for ; Thu, 11 Apr 2013 13:33:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752188Ab3DKNdT (ORCPT ); Thu, 11 Apr 2013 09:33:19 -0400 Received: from mx12.netapp.com ([216.240.18.77]:7381 "EHLO mx12.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935176Ab3DKN2w (ORCPT ); Thu, 11 Apr 2013 09:28:52 -0400 X-IronPort-AV: E=Sophos;i="4.87,455,1363158000"; d="scan'208";a="39479693" Received: from smtp2.corp.netapp.com ([10.57.159.114]) by mx12-out.netapp.com with ESMTP; 11 Apr 2013 06:28:52 -0700 Received: from vpn2ntap-757279.vpn.netapp.com (vpn2ntap-757279.vpn.netapp.com [10.55.72.180]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id r3BDSpA8022031; Thu, 11 Apr 2013 06:28:51 -0700 (PDT) From: andros@netapp.com To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 1/1] NFSv4 release the sequence id in the return on close case Date: Thu, 11 Apr 2013 09:28:45 -0400 Message-Id: <1365686925-1112-1-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.7.10.2 (Apple Git-33) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Andy Adamson Signed-off-by: Andy Adamson --- fs/nfs/nfs4proc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ce87287..36df296 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2276,8 +2276,10 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) if (calldata->arg.fmode == 0) { task->tk_msg.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CLOSE]; if (calldata->roc && - pnfs_roc_drain(inode, &calldata->roc_barrier, task)) + pnfs_roc_drain(inode, &calldata->roc_barrier, task)) { + nfs_release_seqid(calldata->arg.seqid); goto out_wait; + } } nfs_fattr_init(calldata->res.fattr);