Commit 15eb67c1 authored by Peng Tao's avatar Peng Tao Committed by Tom Haynes
Browse files

nfs41: add range to layoutreturn args 



So that callers can specify which range to return.

Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTom Haynes <loghyr@primarydata.com>
parent ceb11e13

fs/nfs/nfs4xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -2012,11 +2012,11 @@ encode_layoutreturn(struct xdr_stream *xdr, 
	p = reserve_space(xdr, 16);

	*p++ = cpu_to_be32(0);		/* reclaim. always 0 for now */

	*p++ = cpu_to_be32(args->layout_type);

	*p++ = cpu_to_be32(args->iomode);

	*p++ = cpu_to_be32(args->range.iomode);

	*p = cpu_to_be32(RETURN_FILE);

	p = reserve_space(xdr, 16);

	p = xdr_encode_hyper(p, 0);

	p = xdr_encode_hyper(p, NFS4_MAX_UINT64);

	p = xdr_encode_hyper(p, args->range.offset);

	p = xdr_encode_hyper(p, args->range.length);

	spin_lock(&args->inode->i_lock);

	encode_nfs4_stateid(xdr, &args->stateid);

	spin_unlock(&args->inode->i_lock);

fs/nfs/pnfs.c

+3 −1
Original line number Diff line number Diff line
@@ -916,7 +916,9 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, nfs4_stateid stateid, 
	lrp->args.stateid = stateid;

	lrp->args.layout_type = NFS_SERVER(ino)->pnfs_curr_ld->id;

	lrp->args.inode = ino;

	lrp->args.iomode = iomode;

	lrp->args.range.iomode = iomode;

	lrp->args.range.offset = 0;

	lrp->args.range.length = NFS4_MAX_UINT64;

	lrp->args.layout = lo;

	lrp->clp = NFS_SERVER(ino)->nfs_client;

	lrp->cred = lo->plh_lc_cred;

include/linux/nfs_xdr.h

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ struct nfs4_layoutreturn_args { 
	struct nfs4_sequence_args seq_args;

	struct pnfs_layout_hdr *layout;

	struct inode *inode;

	enum pnfs_iomode iomode;

	struct pnfs_layout_range range;

	nfs4_stateid stateid;

	__u32   layout_type;

};