From patchwork Wed May 25 05:09:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 9134727 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 195AE607D9 for ; Wed, 25 May 2016 05:09:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FCD82810D for ; Wed, 25 May 2016 05:09:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0482928110; Wed, 25 May 2016 05:09:49 +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 7D9482810D for ; Wed, 25 May 2016 05:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750812AbcEYFJr (ORCPT ); Wed, 25 May 2016 01:09:47 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33770 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750724AbcEYFJq (ORCPT ); Wed, 25 May 2016 01:09:46 -0400 Received: by mail-pa0-f51.google.com with SMTP id xk12so13836531pac.0 for ; Tue, 24 May 2016 22:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=primarydata-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TTQZxkx/Ijhzgd84XWTD3mVNP/3zS1+S5DqvRXysTNI=; b=FyKdBX6FsTSgTVc/717QaW7W8hEdo7dsFg0aojdZWTxMrgaEejVoh6MjgGiOrB2Vq6 DhK39wuLq3nfsp+2Yt07tTD3g9/BeCjZlr51EOMePxwx4CKofXPZQQpThsF38QEf+wxT fCVZFfSt8OqziMjKuTunhuM+oIt8E+xvW3J/tzNdUvTvZVd2/wbQpdEFvDjKlgnGgUW6 sXtJAxxN+SQ0MsGrWFuhnQXeOTT0tCYmF9afnqvBIFunc5bQI/NmVZ8djVBmec3h+ZTd ARCrLkhosYfIPZY61S0yUL8AUW3Ay2to1tMXCqVvknUl0IUlGN7bZrDGWFQeRuxq38a5 T1bg== 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=TTQZxkx/Ijhzgd84XWTD3mVNP/3zS1+S5DqvRXysTNI=; b=b7IMYRM2Lul0Wwn126GN7NXKbdWfvLvbxbWnXTm5iNN/Mvw1CJ+C7DRsVSyRW2LtoP JwHwYZuscxKcGGUHq1dDUCvVETfl+SdGs5j5ClJhVYi67UUIi4xB7aPPJzdLyD8JVEic zGKH1U/SkdcxzuyaBsVQKK5ExpbYTicIB3yOf/MMh0+uuQG4vVYMuqQsrkCfqDZAoIeK lgFBPKmoBHGHS1Bz1WeDwTyrEOccoShGQycM67/Xgzm76L53VdfYknAcAQZTR+7Va7g/ KImiEBixt/z79KYMfeQEDUFeUbx+9Ny4dKfLVy9+L52fjdfzLOzNV8+WLi2wf06rkjS8 88pA== X-Gm-Message-State: ALyK8tJIw/a2tfsDuOGcgPfz+PdgHXUjICZFErMILukxFVZw5qG9DxzHHXnoTtZwmGgo+U9U X-Received: by 10.66.1.99 with SMTP id 3mr2894352pal.26.1464152985646; Tue, 24 May 2016 22:09:45 -0700 (PDT) Received: from jhereg.localdomain (c-50-131-226-197.hsd1.ca.comcast.net. [50.131.226.197]) by smtp.gmail.com with ESMTPSA id s8sm9035341pav.39.2016.05.24.22.09.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2016 22:09:44 -0700 (PDT) From: Tom Haynes X-Google-Original-From: Tom Haynes To: "J. Bruce Fields" Cc: Linux NFS Mailing list , Christoph Hellwig Subject: [PATCH 1/4] nfsd: flex file device id encoding will need the server addres Date: Tue, 24 May 2016 22:09:36 -0700 Message-Id: <1464152979-103988-2-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1464152979-103988-1-git-send-email-loghyr@primarydata.com> References: <1464152979-103988-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-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Tom Haynes Reviewed-by: Jeff Layton Reviewed-by: Christoph Hellwig --- fs/nfsd/blocklayout.c | 2 ++ fs/nfsd/nfs4proc.c | 1 + fs/nfsd/pnfs.h | 1 + 3 files changed, 4 insertions(+) diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c index e55b524..248adb6 100644 --- a/fs/nfsd/blocklayout.c +++ b/fs/nfsd/blocklayout.c @@ -162,6 +162,7 @@ nfsd4_block_get_device_info_simple(struct super_block *sb, static __be32 nfsd4_block_proc_getdeviceinfo(struct super_block *sb, + struct svc_rqst *rqstp, struct nfs4_client *clp, struct nfsd4_getdeviceinfo *gdp) { @@ -354,6 +355,7 @@ nfsd4_block_get_device_info_scsi(struct super_block *sb, static __be32 nfsd4_scsi_proc_getdeviceinfo(struct super_block *sb, + struct svc_rqst *rqstp, struct nfs4_client *clp, struct nfsd4_getdeviceinfo *gdp) { diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index de1ff1d..b28e45b 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1270,6 +1270,7 @@ nfsd4_getdeviceinfo(struct svc_rqst *rqstp, nfserr = nfs_ok; if (gdp->gd_maxcount != 0) { nfserr = ops->proc_getdeviceinfo(exp->ex_path.mnt->mnt_sb, + rqstp, cstate->session->se_client, gdp); } diff --git a/fs/nfsd/pnfs.h b/fs/nfsd/pnfs.h index 7d073b9..e855677 100644 --- a/fs/nfsd/pnfs.h +++ b/fs/nfsd/pnfs.h @@ -21,6 +21,7 @@ struct nfsd4_layout_ops { u32 notify_types; __be32 (*proc_getdeviceinfo)(struct super_block *sb, + struct svc_rqst *rqstp, struct nfs4_client *clp, struct nfsd4_getdeviceinfo *gdevp); __be32 (*encode_getdeviceinfo)(struct xdr_stream *xdr,