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

Commit 68ebe3cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.14-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 "Hightlights include:

  stable fixes:
   - nfs/filelayout: fix oops when freeing filelayout segment
   - NFS: Fix uninitialized rpc_wait_queue

  bugfixes:
   - NFSv4/pnfs: Fix an infinite layoutget loop
   - nfs: RPC_MAX_AUTH_SIZE is in bytes"

* tag 'nfs-for-4.14-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4/pnfs: Fix an infinite layoutget loop
  nfs/filelayout: fix oops when freeing filelayout segment
  sunrpc: remove redundant initialization of sock
  NFS: Fix uninitialized rpc_wait_queue
  NFS: Cleanup error handling in nfs_idmap_request_key()
  nfs: RPC_MAX_AUTH_SIZE is in bytes
parents 8a5776a5 e8fa33a6

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ static void nfs_cb_idr_remove_locked(struct nfs_client *clp) 
static void pnfs_init_server(struct nfs_server *server)

{

	rpc_init_wait_queue(&server->roc_rpcwaitq, "pNFS ROC");

	rpc_init_wait_queue(&server->uoc_rpcwaitq, "NFS UOC");

}



#else
@@ -888,6 +887,7 @@ struct nfs_server *nfs_alloc_server(void) 
	ida_init(&server->openowner_id);

	ida_init(&server->lockowner_id);

	pnfs_init_server(server);

	rpc_init_wait_queue(&server->uoc_rpcwaitq, "NFS UOC");



	return server;

}

fs/nfs/filelayout/filelayout.c

+2 −1
Original line number Diff line number Diff line
@@ -745,6 +745,7 @@ filelayout_free_lseg(struct pnfs_layout_segment *lseg) 
	struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg);



	dprintk("--> %s\n", __func__);

	if (fl->dsaddr != NULL)

		nfs4_fl_put_deviceid(fl->dsaddr);

	/* This assumes a single RW lseg */

	if (lseg->pls_range.iomode == IOMODE_RW) {

fs/nfs/nfs4idmap.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static struct key *nfs_idmap_request_key(const char *name, size_t namelen, 
	ssize_t ret;



	ret = nfs_idmap_get_desc(name, namelen, type, strlen(type), &desc);

	if (ret <= 0)

	if (ret < 0)

		return ERR_PTR(ret);



	rkey = request_key(&key_type_id_resolver, desc, "");

fs/nfs/nfs4proc.c

+1 −2
Original line number Diff line number Diff line
@@ -8399,8 +8399,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, 
		lo = NFS_I(inode)->layout;

		/* If the open stateid was bad, then recover it. */

		if (!lo || test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags) ||

		    nfs4_stateid_match_other(&lgp->args.stateid,

					&lgp->args.ctx->state->stateid)) {

		    !nfs4_stateid_match_other(&lgp->args.stateid, &lo->plh_stateid)) {

			spin_unlock(&inode->i_lock);

			exception->state = lgp->args.ctx->state;

			exception->stateid = &lgp->args.stateid;

fs/nfs/nfs4xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -1842,8 +1842,8 @@ static void encode_create_session(struct xdr_stream *xdr, 
	 * Assumes OPEN is the biggest non-idempotent compound.

	 * 2 is the verifier.

	 */

	max_resp_sz_cached = (NFS4_dec_open_sz + RPC_REPHDRSIZE +

			      RPC_MAX_AUTH_SIZE + 2) * XDR_UNIT;

	max_resp_sz_cached = (NFS4_dec_open_sz + RPC_REPHDRSIZE + 2)

				* XDR_UNIT + RPC_MAX_AUTH_SIZE;



	encode_op_hdr(xdr, OP_CREATE_SESSION, decode_create_session_maxsz, hdr);

	p = reserve_space(xdr, 16 + 2*28 + 20 + clnt->cl_nodelen + 12);