Commit d7c920d1 authored Jun 14, 2016 by Tom Haynes Committed by J. Bruce Fields Jul 13, 2016

nfsd: flex file device id encoding will need the server address



Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jeff Layton <jlayton@poochiereds.net>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent 04d70eda

fs/nfsd/blocklayout.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)
		{

fs/nfsd/nfs4proc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

fs/nfsd/pnfs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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,