Commit d7c920d1 authored by Tom Haynes's avatar Tom Haynes Committed by J. Bruce Fields

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

Signed-off-by: default avatarTom Haynes <loghyr@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJeff Layton <jlayton@poochiereds.net>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 04d70eda
...@@ -162,6 +162,7 @@ nfsd4_block_get_device_info_simple(struct super_block *sb, ...@@ -162,6 +162,7 @@ nfsd4_block_get_device_info_simple(struct super_block *sb,
static __be32 static __be32
nfsd4_block_proc_getdeviceinfo(struct super_block *sb, nfsd4_block_proc_getdeviceinfo(struct super_block *sb,
struct svc_rqst *rqstp,
struct nfs4_client *clp, struct nfs4_client *clp,
struct nfsd4_getdeviceinfo *gdp) struct nfsd4_getdeviceinfo *gdp)
{ {
...@@ -354,6 +355,7 @@ nfsd4_block_get_device_info_scsi(struct super_block *sb, ...@@ -354,6 +355,7 @@ nfsd4_block_get_device_info_scsi(struct super_block *sb,
static __be32 static __be32
nfsd4_scsi_proc_getdeviceinfo(struct super_block *sb, nfsd4_scsi_proc_getdeviceinfo(struct super_block *sb,
struct svc_rqst *rqstp,
struct nfs4_client *clp, struct nfs4_client *clp,
struct nfsd4_getdeviceinfo *gdp) struct nfsd4_getdeviceinfo *gdp)
{ {
......
...@@ -1270,7 +1270,7 @@ nfsd4_getdeviceinfo(struct svc_rqst *rqstp, ...@@ -1270,7 +1270,7 @@ nfsd4_getdeviceinfo(struct svc_rqst *rqstp,
nfserr = nfs_ok; nfserr = nfs_ok;
if (gdp->gd_maxcount != 0) { if (gdp->gd_maxcount != 0) {
nfserr = ops->proc_getdeviceinfo(exp->ex_path.mnt->mnt_sb, 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; gdp->gd_notify_types &= ops->notify_types;
......
...@@ -21,6 +21,7 @@ struct nfsd4_layout_ops { ...@@ -21,6 +21,7 @@ struct nfsd4_layout_ops {
u32 notify_types; u32 notify_types;
__be32 (*proc_getdeviceinfo)(struct super_block *sb, __be32 (*proc_getdeviceinfo)(struct super_block *sb,
struct svc_rqst *rqstp,
struct nfs4_client *clp, struct nfs4_client *clp,
struct nfsd4_getdeviceinfo *gdevp); struct nfsd4_getdeviceinfo *gdevp);
__be32 (*encode_getdeviceinfo)(struct xdr_stream *xdr, __be32 (*encode_getdeviceinfo)(struct xdr_stream *xdr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment