nfsd bugfixes for 3.19

Please pull two nfsd bugfixes from

git://linux-nfs.org/~bfields/linux.git for-3.19

--b.

----------------------------------------------------------------
J. Bruce Fields (1):
rpc: fix xdr_truncate_encode to handle buffer ending on page boundary

Jeff Layton (1):
nfsd: fix fi_delegees leak when fi_had_conflict returns true

 fs/nfsd/nfs4state.c | 2 +-
 net/sunrpc/xdr.c    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)