Commit dc9319f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linux 

Pull two nfsd bugfixes from Bruce Fields.

* 'for-3.19' of git://linux-nfs.org/~bfields/linux:
  rpc: fix xdr_truncate_encode to handle buffer ending on page boundary
  nfsd: fix fi_delegees leak when fi_had_conflict returns true
parents 20ebb345 49a068f8

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -3897,11 +3897,11 @@ nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh, 
		status = nfs4_setlease(dp);

		goto out;

	}

	atomic_inc(&fp->fi_delegees);

	if (fp->fi_had_conflict) {

		status = -EAGAIN;

		goto out_unlock;

	}

	atomic_inc(&fp->fi_delegees);

	hash_delegation_locked(dp, fp);

	status = 0;

out_unlock:

net/sunrpc/xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ void xdr_truncate_encode(struct xdr_stream *xdr, size_t len) 
	struct kvec *head = buf->head;

	struct kvec *tail = buf->tail;

	int fraglen;

	int new, old;

	int new;



	if (len > buf->len) {

		WARN_ON_ONCE(1);
@@ -629,8 +629,8 @@ void xdr_truncate_encode(struct xdr_stream *xdr, size_t len) 
	buf->len -= fraglen;



	new = buf->page_base + buf->page_len;

	old = new + fraglen;

	xdr->page_ptr -= (old >> PAGE_SHIFT) - (new >> PAGE_SHIFT);



	xdr->page_ptr = buf->pages + (new >> PAGE_SHIFT);



	if (buf->page_len) {

		xdr->p = page_address(*xdr->page_ptr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE