On Tue, 2016-05-24 at 22:09 -0700, Tom Haynes wrote:
> Signed-off-by: Tom Haynes <loghyr@xxxxxxxxxxxxxxx>
> ---
> fs/nfsd/blocklayout.c | 2 ++
> fs/nfsd/nfs4proc.c | 1 +
> fs/nfsd/pnfs.h | 1 +
> 3 files changed, 4 insertions(+)
>
> 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..b28e45b 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -1270,6 +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,
> + rqstp,
> cstate->session->se_client, gdp);
> }
>
> 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,
Looks fine.
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
