From patchwork Wed May 25 20:43:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 9136181 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 37BF46075C for ; Wed, 25 May 2016 20:44:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C231282DA for ; Wed, 25 May 2016 20:44:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F959282E1; Wed, 25 May 2016 20:44:07 +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 DA963282E0 for ; Wed, 25 May 2016 20:44:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751042AbcEYUoE (ORCPT ); Wed, 25 May 2016 16:44:04 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:36660 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148AbcEYUoD (ORCPT ); Wed, 25 May 2016 16:44:03 -0400 Received: by mail-pa0-f48.google.com with SMTP id eu11so11919956pad.3 for ; Wed, 25 May 2016 13:44:02 -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=XoQPj98Bor2nZl2drHgb02fdHgHZbOXAF1YNIRNmvmPN71C5nmLBqKaId8JuygMvO3 E1jLObEIMBqtQ5CbW0S2g9hJ2TZ6uiuMLpetjyHzRTRvMU5L+v8OWrPuIaD2LCV0rC1u 0dfLtO1wUpQruwIG/30oK1PgCBbD3ySYrCljsACQQps4cYcJ5ZjWNvpro/NYksWcwTnE 0prOQCNlfWBjBR9SOuo1xtXu55CutsLW2SCGyK5ohpKBM0tGv6SZ4Z9KVREt6AeU+gLC ETOUfZ62bFgAtzf9QrKhkGGnbW4LePa6BUqqWE8992HT+y3spxVuvWWprc/nlfs4ecxS DpYQ== 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=WH6YsMnThoHHQje5UO8mlIICMqLWnLX7MBRIj4/uJ5zBwqHmTVKpu94guJ81K8vn+A 0lwMKFH4nvpMNQkFfwFy+PNAack+XbrNjvIqbK0XBi1LbK8el078Bm9hrHvdJ0GZ+I+4 Tk3CwIFwWZ6ODVoegRO4Ni1Wreb/aR0TXy6rPYUjCvocY9pVQHnasvtqDqLB6Lc5YGXc RbPn2FjD4Bruz7Px323EYZFvIkPNiqlAytPUCkbKsXzbSIIVCZDE2HFJy90ZqfPgP2Kq KZxyaqqT3B09hB6c5zRMt2KnOD8Mr4OC90DoQrUOi7b3J8hD4hlr/B6CpTDEnorSm+Ir ANBQ== X-Gm-Message-State: ALyK8tLfI/FohVffC1nYuaSeRL+cKZsTWfULpfd1HqdCACvDZaiLYnBiseCAExGw45C8T8rd X-Received: by 10.66.149.194 with SMTP id uc2mr8907746pab.116.1464209041516; Wed, 25 May 2016 13:44:01 -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 z9sm506413pfa.84.2016.05.25.13.44.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 May 2016 13:44:00 -0700 (PDT) From: Tom Haynes X-Google-Original-From: Tom Haynes To: "J. Bruce Fields" Cc: Linux NFS Mailing list , Christoph Hellwig Subject: [V2 1/2] nfsd: flex file device id encoding will need the server address Date: Wed, 25 May 2016 13:43:54 -0700 Message-Id: <1464209035-84591-2-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1464209035-84591-1-git-send-email-loghyr@primarydata.com> References: <1464209035-84591-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,