From patchwork Thu May 26 17:05:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 9137285 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 1B9C76075C for ; Thu, 26 May 2016 17:05:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C6E128294 for ; Thu, 26 May 2016 17:05:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 014EB282ED; Thu, 26 May 2016 17:05:24 +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 E76DB28294 for ; Thu, 26 May 2016 17:05:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752431AbcEZRFW (ORCPT ); Thu, 26 May 2016 13:05:22 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:35169 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753880AbcEZRFW (ORCPT ); Thu, 26 May 2016 13:05:22 -0400 Received: by mail-pf0-f173.google.com with SMTP id g64so32867109pfb.2 for ; Thu, 26 May 2016 10:05:21 -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=Kno+1dnvOWHsY1Ids9j56/j7NB1/H802+2ZIRXcjgmKbw2hwYyZ75AmVc1g3T1zqKs 1SCQaG+D53A/X18bGyfjiL3cqY/ndTC8+6hprlAPJwzL0mz7xCoxP/ahum1+YJCjx9Y0 /8/ZHX69V+bDKW0ahshdo+dnoH8aoaiOVvW03bTBPKWJA9N/k/t9Vm1kJ83b8/MSpFZJ UahS9qxt7MOY78sW0184rdxT/C82YV8KbQ7QfQjUOkXjAHpAF153w9BuukbO5cJdrlhl uNZHAVrbLCwVsHWhPxehSNw+60ZZgyA3J+mHR1GQuKhHRGs6hB4LmOuxhQ8NSHfR0TdZ d+iQ== 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=eBBe9E9ndTe65/8pkgGquD7Q11lB7BrmARZCQR0mGDEE17Fu4R2cuNp5Uir06i4pg0 vItFbO0mBoGW4tMBxhJyp3/ePt3SJDbIdwT1y81LI/1TWXGSYGCximxyNT2+N4TvmMiN rGPprNn/2iwiDkky4z56/198TGtlX+EozkGnFjA8JXBq3ujh46EUkfEfTf3cmKdObGtk o+V0DdxzQRhWSG6a5lYTLZeUF069FoqcneVsb6bYSUOHBOk0g4lBWOburLXqDh2+fVhJ sxKk0mGGn147UGU/SvqaqmlebLJ94P3knr4EWIcg1dwN21/o0UbKRwC02S5O1uOwaZJA 7YOw== X-Gm-Message-State: ALyK8tLsSobc1z6PKlgx44P2BULScDWuNz3QO9egE1GVO2RpLaA9Q14RihNAL7v8RqxpfESg X-Received: by 10.98.98.69 with SMTP id w66mr15742510pfb.20.1464282320907; Thu, 26 May 2016 10:05:20 -0700 (PDT) Received: from jhereg.localdomain (63-157-6-18.dia.static.qwest.net. [63.157.6.18]) by smtp.gmail.com with ESMTPSA id 83sm7420932pfl.12.2016.05.26.10.05.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2016 10:05:20 -0700 (PDT) From: Tom Haynes X-Google-Original-From: Tom Haynes To: "J. Bruce Fields" Cc: Linux NFS Mailing list , Christoph Hellwig Subject: [V3 1/2] nfsd: flex file device id encoding will need the server address Date: Thu, 26 May 2016 10:05:10 -0700 Message-Id: <1464282311-103795-2-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1464282311-103795-1-git-send-email-loghyr@primarydata.com> References: <1464282311-103795-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,