From patchwork Fri Oct 13 20:55:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olga Kornievskaia X-Patchwork-Id: 10005977 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 9F9E660325 for ; Fri, 13 Oct 2017 20:56:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9031029184 for ; Fri, 13 Oct 2017 20:56:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8139E29190; Fri, 13 Oct 2017 20:56: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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 3232A29184 for ; Fri, 13 Oct 2017 20:55:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752291AbdJMUz4 (ORCPT ); Fri, 13 Oct 2017 16:55:56 -0400 Received: from mx141.netapp.com ([216.240.21.12]:13539 "EHLO mx141.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751659AbdJMUzy (ORCPT ); Fri, 13 Oct 2017 16:55:54 -0400 X-IronPort-AV: E=Sophos;i="5.43,372,1503385200"; d="scan'208";a="233507265" Received: from vmwexchts03-prd.hq.netapp.com ([10.122.105.31]) by mx141-out.netapp.com with ESMTP; 13 Oct 2017 13:30:17 -0700 Received: from smtp2.corp.netapp.com (10.122.76.114) by VMWEXCHTS03-PRD.hq.netapp.com (10.122.105.31) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Fri, 13 Oct 2017 13:55:53 -0700 Received: from Olgas-MBP-107.vpn.netapp.com (olgas-mbp-107.vpn.netapp.com [10.55.72.166]) by smtp2.corp.netapp.com (8.14.9+Sun/8.13.1/NTAP-1.6) with ESMTP id v9DKtoYt013734; Fri, 13 Oct 2017 13:55:53 -0700 (PDT) From: Olga Kornievskaia To: , CC: Subject: [PATCH v5 04/23] NFS OFFLOAD_STATUS op Date: Fri, 13 Oct 2017 16:55:42 -0400 Message-ID: <20171013205550.65573-5-kolga@netapp.com> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20171013205550.65573-1-kolga@netapp.com> References: <20171013205550.65573-1-kolga@netapp.com> MIME-Version: 1.0 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 Signed-off-by: Olga Kornievskaia --- fs/nfs/nfs42.h | 5 ++++- fs/nfs/nfs42proc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs42.h b/fs/nfs/nfs42.h index b6cd153..6b9decf 100644 --- a/fs/nfs/nfs42.h +++ b/fs/nfs/nfs42.h @@ -11,6 +11,7 @@ */ #define PNFS_LAYOUTSTATS_MAXDEV (4) +#if defined(CONFIG_NFS_V4_2) /* nfs4.2proc.c */ int nfs42_proc_allocate(struct file *, loff_t, loff_t); ssize_t nfs42_proc_copy(struct file *, loff_t, struct file *, loff_t, size_t); @@ -19,5 +20,7 @@ int nfs42_proc_layoutstats_generic(struct nfs_server *, struct nfs42_layoutstat_data *); int nfs42_proc_clone(struct file *, struct file *, loff_t, loff_t, loff_t); - +int nfs42_proc_offload_status(struct file *, nfs4_stateid *, + struct nfs42_offload_status_res *); +#endif /* CONFIG_NFS_V4_2) */ #endif /* __LINUX_FS_NFS_NFS4_2_H */ diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c index 6c2db51..65fb014 100644 --- a/fs/nfs/nfs42proc.c +++ b/fs/nfs/nfs42proc.c @@ -263,6 +263,49 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src, return err; } +int _nfs42_proc_offload_status(struct file *dst, nfs4_stateid *stateid, + struct nfs42_offload_status_res *res) +{ + struct nfs42_offload_status_args args = { + .osa_src_fh = NFS_FH(file_inode(dst)), + }; + struct nfs_server *dst_server = NFS_SERVER(file_inode(dst)); + struct rpc_message msg = { + .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_OFFLOAD_STATUS], + .rpc_resp = res, + .rpc_argp = &args, + }; + int status; + + memcpy(&args.osa_stateid, stateid, sizeof(args.osa_stateid)); + status = nfs4_call_sync(dst_server->client, dst_server, &msg, + &args.osa_seq_args, &res->osr_seq_res, 0); + if (status == -ENOTSUPP) + dst_server->caps &= ~NFS_CAP_OFFLOAD_STATUS; + + return status; +} + +int nfs42_proc_offload_status(struct file *dst, nfs4_stateid *stateid, + struct nfs42_offload_status_res *res) +{ + struct nfs_server *dst_server = NFS_SERVER(file_inode(dst)); + struct nfs4_exception exception = { }; + int status; + + if (!(dst_server->caps & NFS_CAP_OFFLOAD_STATUS)) + return -EOPNOTSUPP; + + do { + status = _nfs42_proc_offload_status(dst, stateid, res); + if (status == -ENOTSUPP) + return -EOPNOTSUPP; + status = nfs4_handle_exception(dst_server, status, &exception); + } while (exception.retry); + + return status; +} + static loff_t _nfs42_proc_llseek(struct file *filep, struct nfs_lock_context *lock, loff_t offset, int whence) {