From patchwork Tue Jun 14 20:41:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 9176913 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 4FFEA60573 for ; Tue, 14 Jun 2016 20:41:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41DA92793D for ; Tue, 14 Jun 2016 20:41:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34A0928236; Tue, 14 Jun 2016 20:41:54 +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 2FE492804C for ; Tue, 14 Jun 2016 20:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbcFNUlw (ORCPT ); Tue, 14 Jun 2016 16:41:52 -0400 Received: from mail-io0-f182.google.com ([209.85.223.182]:34470 "EHLO mail-io0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751597AbcFNUlv (ORCPT ); Tue, 14 Jun 2016 16:41:51 -0400 Received: by mail-io0-f182.google.com with SMTP id 5so5433715ioy.1 for ; Tue, 14 Jun 2016 13:41:51 -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=uT4Ro6CegOP4swBSV1tphkZNlXTXgca7JCzjCWuVuFCN2hfcpbn3ioP6HLinE7uuqg DuhNd7FwFKdjkNKOM/SMo3NJXTRwpOAGG+A0HtjJmyH8uQsWtwUnF7BPs6X0wpf96IZ0 4M+9dat1WxPukzD2gxH/21OE55PnjwBjRwMIwwFgySrDqdPL3qP9d0bbvBveYCeiaOHl 1rUvSnoEFWOQo/X+JrWMQyuMKL4OhSuGqFvPuu+eSAPt0gzpQOTBmogK8Pyw5Mnn7dOT n+cQoDKRGSyQF4xRzfYM6TH0tZLZzS8D3WBNreDAZidhW0OLBT2xhxG2mnqINfxnzOW6 7DHw== 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=MVQ80RZFBuGr4kakjymoa4i5oB4DtPV1eFw5gWpKU7yQSqe4dhZJcXcaRbIKjAWTSd OsA3IKBp3vyZvcnlxQyPFV6Qio4C/NwIb0eXWYJ+sc6wCAlNcvu8YBKe93OCxYqamjEP Yi76V5NqNgv4D3woyZ8DhqFWcCtVKDxiBq+scVahGWpZCP6ygTL8Z0IK+OM+KRII0Sef 7x9Z1F22V+abbTu+N0O1d72VYR8QlKHhiY2c60P2jJi3FS6hYVyoZhozjdnR6aBWl/QZ PDKadK0k4NhV1zGGrzLRWSNXZ5BQT7T7izdUydU9PNAhZyPURuPcIUEKBHfu5pkZTOB5 TQag== X-Gm-Message-State: ALyK8tJtndbWaGMn4CkFZvrO77lS98vz/XVpRi6bMrTK7lcZoYXDo8xtb+mWiB0Or5Z3CbxG X-Received: by 10.107.38.145 with SMTP id m139mr35336694iom.15.1465936910492; Tue, 14 Jun 2016 13:41:50 -0700 (PDT) Received: from jhereg.localdomain (c-107-4-70-42.hsd1.mi.comcast.net. [107.4.70.42]) by smtp.gmail.com with ESMTPSA id l14sm2645281ita.8.2016.06.14.13.41.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jun 2016 13:41:50 -0700 (PDT) From: Tom Haynes X-Google-Original-From: Tom Haynes To: "J. Bruce Fields" Cc: linux-nfs@vger.kernel.org Subject: [V5 1/2] nfsd: flex file device id encoding will need the server address Date: Tue, 14 Jun 2016 13:41:27 -0700 Message-Id: <1465936888-103341-2-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1465936888-103341-1-git-send-email-loghyr@primarydata.com> References: <1465936888-103341-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,