From patchwork Fri May 27 05:09:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 9137631 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 8B20D60759 for ; Fri, 27 May 2016 05:09:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F9F7252D5 for ; Fri, 27 May 2016 05:09:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7444827D10; Fri, 27 May 2016 05:09:41 +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 6979127CF9 for ; Fri, 27 May 2016 05:09:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751753AbcE0FJj (ORCPT ); Fri, 27 May 2016 01:09:39 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:33591 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750905AbcE0FJi (ORCPT ); Fri, 27 May 2016 01:09:38 -0400 Received: by mail-pf0-f172.google.com with SMTP id b124so38047906pfb.0 for ; Thu, 26 May 2016 22:09:38 -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=uJ9pEDgU78ctDH3FV/G4rvp0WLNJXw+OmFDG0vfgLU4=; b=dKeY9Gi8Qo7WBByd2FqdqOhcawYmVMpx6s+7vJT0k8OapdNSdEKlUi+gHzwvPkUd1c /n7zhEeONEzFrKsQ02VOK7COONFnbamGWbQlOdYOAViMOJwLMQK9ZsgxHyM4BdQApJC2 Ocetc0M/+9y2201ZVIL9eNctLO4mNzHHfCs5vSlHK6JmT0EpEXLRPzsVULKQf7ufwoof rEAzmJZydgkF6SrLnCTjGBen15YH+42b6JJcmxZsDTLmwAaQXcmbm9JklvwvJ6ijMjb4 c8s0f0CNSVifVVg0P/qFe8wrdoAx18KvYuTTjXrizit8QXJGCUnsSPRM5fVniXb6g3Io MtqA== 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=uJ9pEDgU78ctDH3FV/G4rvp0WLNJXw+OmFDG0vfgLU4=; b=Ij1X1HivHB0JnhNb42F6yZx4dc+4ub5F4Lteqq/H8LtvJ7EFYtKNo8xXONgLUVo5be XPOMwAwa9b9QxKTF0m7NuXZ6pQLlxc3iWwEfFMNxDm0JVBu14g6QK8TeasXrkQl1h5mK qzn02y5Jrvqaupfk8Fy9sVRdcF1ZtgCrN9VYHesrhX/wvHhMvm84RT0P1IVlrYJJcd5K fWJwUrcPraqb6aGi0fIAdFpWr6qHDgoft60QsbAS3p/0+r1FSEXD586m7jImEwfrxPr2 sblAUyhMpCQ7p2SQ8D7El1u+3i/KQB7ZhDV4tW81nbIjHPBsC3SgP7CF4xYa6uSiemhE jYCQ== X-Gm-Message-State: ALyK8tJswW1H/kv4XDbRH2ZvZxQmR2wUWWsukH2MbUue/3QtfBRkJTaG9WTX1+7mrNcP6LJn X-Received: by 10.98.109.198 with SMTP id i189mr19465763pfc.106.1464325777832; Thu, 26 May 2016 22:09:37 -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 22sm9852134pfw.92.2016.05.26.22.09.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2016 22:09:37 -0700 (PDT) From: Tom Haynes X-Google-Original-From: Tom Haynes To: "J. Bruce Fields" Cc: Linux NFS Mailing list , Christoph Hellwig Subject: [V4 1/2] nfsd: flex file device id encoding will need the server address Date: Thu, 26 May 2016 22:09:06 -0700 Message-Id: <1464325747-118810-2-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1464325747-118810-1-git-send-email-loghyr@primarydata.com> References: <1464325747-118810-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: Christoph Hellwig Reviewed-by: Jeff Layton --- fs/nfsd/blocklayout.c | 2 ++ fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/pnfs.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) 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..2ee2dc17 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1270,7 +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, - cstate->session->se_client, gdp); + rqstp, cstate->session->se_client, gdp); } gdp->gd_notify_types &= ops->notify_types; 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,