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

Commit 5d22c5ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux 

Pull nfsd updates from Bruce Fields:
 "A very quiet cycle for nfsd, mainly just an RDMA update from Chuck
  Lever"

* tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux:
  sunrpc: fix stripping of padded MIC tokens
  svcrpc: autoload rdma module
  svcrdma: Generalize svc_rdma_xdr_decode_req()
  svcrdma: Eliminate code duplication in svc_rdma_recvfrom()
  svcrdma: Drain QP before freeing svcrdma_xprt
  svcrdma: Post Receives only for forward channel requests
  svcrdma: Remove superfluous line from rdma_read_chunks()
  svcrdma: svc_rdma_put_context() is invoked twice in Send error path
  svcrdma: Do not add XDR padding to xdr_buf page vector
  svcrdma: Support IPv6 with NFS/RDMA
  nfsd: handle seqid wraparound in nfsd4_preprocess_layout_stateid
  Remove unnecessary allocation
parents 0e01df10 c0cb8bf3

fs/nfsd/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, __be32 *p, 
	 */

	hdr = (void*)p - rqstp->rq_arg.head[0].iov_base;

	dlen = rqstp->rq_arg.head[0].iov_len + rqstp->rq_arg.page_len

		- hdr;

		+ rqstp->rq_arg.tail[0].iov_len - hdr;

	/*

	 * Round the length of the data which was specified up to

	 * the next multiple of XDR units and then compare that

fs/nfsd/nfs4layouts.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ nfsd4_preprocess_layout_stateid(struct svc_rqst *rqstp, 


		status = nfserr_bad_stateid;

		mutex_lock(&ls->ls_mutex);

		if (stateid->si_generation > stid->sc_stateid.si_generation)

		if (nfsd4_stateid_generation_after(stateid, &stid->sc_stateid))

			goto out_unlock_stid;

		if (layout_type != ls->ls_layout_type)

			goto out_unlock_stid;

fs/nfsd/nfs4state.c

+1 −7
Original line number Diff line number Diff line
@@ -4651,12 +4651,6 @@ grace_disallows_io(struct net *net, struct inode *inode) 
	return opens_in_grace(net) && mandatory_lock(inode);

}



/* Returns true iff a is later than b: */

static bool stateid_generation_after(stateid_t *a, stateid_t *b)

{

	return (s32)(a->si_generation - b->si_generation) > 0;

}



static __be32 check_stateid_generation(stateid_t *in, stateid_t *ref, bool has_session)

{

	/*
@@ -4670,7 +4664,7 @@ static __be32 check_stateid_generation(stateid_t *in, stateid_t *ref, bool has_s 
		return nfs_ok;



	/* If the client sends us a stateid from the future, it's buggy: */

	if (stateid_generation_after(in, ref))

	if (nfsd4_stateid_generation_after(in, ref))

		return nfserr_bad_stateid;

	/*

	 * However, we could see a stateid from the past, even from a

fs/nfsd/state.h

+5 −0
Original line number Diff line number Diff line
@@ -573,6 +573,11 @@ enum nfsd4_cb_op { 
	NFSPROC4_CLNT_CB_SEQUENCE,

};



/* Returns true iff a is later than b: */

static inline bool nfsd4_stateid_generation_after(stateid_t *a, stateid_t *b)

{

	return (s32)(a->si_generation - b->si_generation) > 0;

}



struct nfsd4_compound_state;

struct nfsd_net;

include/linux/sunrpc/svc_rdma.h

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ extern int svc_rdma_handle_bc_reply(struct rpc_xprt *xprt, 
				    struct xdr_buf *rcvbuf);



/* svc_rdma_marshal.c */

extern int svc_rdma_xdr_decode_req(struct rpcrdma_msg *, struct svc_rqst *);

extern int svc_rdma_xdr_decode_req(struct xdr_buf *);

extern int svc_rdma_xdr_encode_error(struct svcxprt_rdma *,

				     struct rpcrdma_msg *,

				     enum rpcrdma_errcode, __be32 *);