diff options
| author | Tom Haynes <thomas.haynes@primarydata.com> | 2016-06-14 13:41:27 -0700 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2016-07-13 15:40:47 -0400 |
| commit | d7c920d1349ad78b9181d8933404e1a378da6feb (patch) | |
| tree | c395ed34b6bd1a97089afa5c0ae8bf8413a389a1 | |
| parent | 04d70edada3266b3cd4cbda9b4359d7a87263138 (diff) | |
| download | op-kernel-dev-d7c920d1349ad78b9181d8933404e1a378da6feb.zip op-kernel-dev-d7c920d1349ad78b9181d8933404e1a378da6feb.tar.gz | |
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>
| -rw-r--r-- | fs/nfsd/blocklayout.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 2 | ||||
| -rw-r--r-- | fs/nfsd/pnfs.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c index 31f3df1..c98563d 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 b1159b3..89fad8a 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, |
