Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e144e539 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1/pnfs: Cleanup copying of pnfs_layout_range structures 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 71b39854

fs/nfs/pnfs.c

+2 −2
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ pnfs_choose_layoutget_stateid(nfs4_stateid *dst, struct pnfs_layout_hdr *lo, 
static struct pnfs_layout_segment *

send_layoutget(struct pnfs_layout_hdr *lo,

	   struct nfs_open_context *ctx,

	   struct pnfs_layout_range *range,

	   const struct pnfs_layout_range *range,

	   gfp_t gfp_flags)

{

	struct inode *ino = lo->plh_inode;
@@ -896,7 +896,7 @@ send_layoutget(struct pnfs_layout_hdr *lo, 
				lgp->args.minlength = i_size - range->offset;

		}

		lgp->args.maxcount = PNFS_LAYOUT_MAXSIZE;

		lgp->args.range = *range;

		pnfs_copy_range(&lgp->args.range, range);

		lgp->args.type = server->pnfs_curr_ld->id;

		lgp->args.inode = ino;

		lgp->args.ctx = get_nfs_open_context(ctx);

fs/nfs/pnfs.h

+7 −0
Original line number Diff line number Diff line
@@ -578,6 +578,13 @@ pnfs_mark_layout_returned_if_empty(struct pnfs_layout_hdr *lo) 
		set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);

}



static inline void

pnfs_copy_range(struct pnfs_layout_range *dst,

		const struct pnfs_layout_range *src)

{

	memcpy(dst, src, sizeof(*dst));

}



extern unsigned int layoutstats_timer;



#ifdef NFS_DEBUG