From patchwork Wed Jan 14 16:44:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5633181 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8DB959F357 for ; Wed, 14 Jan 2015 16:45:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF99D200F4 for ; Wed, 14 Jan 2015 16:45:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8DC3200D4 for ; Wed, 14 Jan 2015 16:45:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753213AbbANQpc (ORCPT ); Wed, 14 Jan 2015 11:45:32 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:55304 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752783AbbANQp3 (ORCPT ); Wed, 14 Jan 2015 11:45:29 -0500 Received: by mail-pa0-f43.google.com with SMTP id kx10so11569834pab.2 for ; Wed, 14 Jan 2015 08:45:28 -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=sYBQVSyiAMCFrjb5ikaw1sFsnoLOa//+SnS5lgHDUP4=; b=COOKH1vWLLF5AXVxy8Eq/6Bu31AUMyGDJhqB9SxkktIftIeXl5f10my6ZaYZmkAIOa DfrXDzLnfhvPwkb8tfUP72qncrnh3B+hPg0MJQosz8OyM4nqndr7vl82WxkNxO+3azSj s4XCWbPMdXmSx7eBywmf2Y5thck8uPUN9TveBIk9lCumjWqllNwdhY/wRNawOt/f8nb/ SGR9VEQQRAhnUjkzdnl3+S7NF78+4IOGucZlDJf4rjh26W4UzrAJEWeXOo3RgKVLUA+C VpkwdWctvUUox5ihDmAMsUZzitZTURKzul+pESZIzLbb+bWE2/Y7d3JUIYrkV6ktV7Rb XZHg== X-Gm-Message-State: ALoCoQlga/IgnmV4BI+i8jJFf1pruXJ8uNHHM1d/eCZPA3tZOO/lzocuC1o0YiuPPyRO2Vr9yNKU X-Received: by 10.70.140.130 with SMTP id rg2mr7048050pdb.49.1421253928521; Wed, 14 Jan 2015 08:45:28 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id u7sm12239039pdp.45.2015.01.14.08.45.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jan 2015 08:45:27 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing list Subject: [PATCH v4 14/50] nfs4: export nfs4_sequence_done Date: Wed, 14 Jan 2015 08:44:20 -0800 Message-Id: <1421253896-73106-15-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1421253896-73106-1-git-send-email-loghyr@primarydata.com> References: <1421253896-73106-1-git-send-email-loghyr@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, T_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: Peng Tao Signed-off-by: Peng Tao Signed-off-by: Tom Haynes --- fs/nfs/nfs4_fs.h | 2 ++ fs/nfs/nfs4proc.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index 90c4ffe..b3c771e 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -447,6 +447,8 @@ extern int nfs40_setup_sequence(struct nfs4_slot_table *tbl, struct nfs4_sequence_args *args, struct nfs4_sequence_res *res, struct rpc_task *task); +extern int nfs4_sequence_done(struct rpc_task *task, + struct nfs4_sequence_res *res); extern void nfs4_free_lock_state(struct nfs_server *server, struct nfs4_lock_state *lsp); diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 9b1a481..1dff02a 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -694,8 +694,7 @@ out_retry: } EXPORT_SYMBOL_GPL(nfs41_sequence_done); -static int nfs4_sequence_done(struct rpc_task *task, - struct nfs4_sequence_res *res) +int nfs4_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *res) { if (res->sr_slot == NULL) return 1; @@ -703,6 +702,7 @@ static int nfs4_sequence_done(struct rpc_task *task, return nfs40_sequence_done(task, res); return nfs41_sequence_done(task, res); } +EXPORT_SYMBOL_GPL(nfs4_sequence_done); int nfs41_setup_sequence(struct nfs4_session *session, struct nfs4_sequence_args *args, @@ -823,11 +823,12 @@ static int nfs4_setup_sequence(const struct nfs_server *server, args, res, task); } -static int nfs4_sequence_done(struct rpc_task *task, - struct nfs4_sequence_res *res) +int nfs4_sequence_done(struct rpc_task *task, + struct nfs4_sequence_res *res) { return nfs40_sequence_done(task, res); } +EXPORT_SYMBOL_GPL(nfs4_sequence_done); #endif /* !CONFIG_NFS_V4_1 */