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

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

Merge tag 'nfs-for-4.15-1' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client updates from Anna Schumaker:
 "Stable bugfixes:
   - Revalidate "." and ".." correctly on open
   - Avoid RCU usage in tracepoints
   - Fix ugly referral attributes
   - Fix a typo in nomigration mount option
   - Revert "NFS: Move the flock open mode check into nfs_flock()"

  Features:
   - Implement a stronger send queue accounting system for NFS over RDMA
   - Switch some atomics to the new refcount_t type

  Other bugfixes and cleanups:
   - Clean up access mode bits
   - Remove special-case revalidations in nfs_opendir()
   - Improve invalidating NFS over RDMA memory for async operations that
     time out
   - Handle NFS over RDMA replies with a worqueue
   - Handle NFS over RDMA sends with a workqueue
   - Fix up replaying interrupted requests
   - Remove dead NFS over RDMA definitions
   - Update NFS over RDMA copyright information
   - Be more consistent with bool initialization and comparisons
   - Mark expected switch fall throughs
   - Various sunrpc tracepoint cleanups
   - Fix various OPEN races
   - Fix a typo in nfs_rename()
   - Use common error handling code in nfs_lock_and_join_request()
   - Check that some structures are properly cleaned up during
     net_exit()
   - Remove net pointer from dprintk()s"

* tag 'nfs-for-4.15-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (62 commits)
  NFS: Revert "NFS: Move the flock open mode check into nfs_flock()"
  NFS: Fix typo in nomigration mount option
  nfs: Fix ugly referral attributes
  NFS: super: mark expected switch fall-throughs
  sunrpc: remove net pointer from messages
  nfs: remove net pointer from messages
  sunrpc: exit_net cleanup check added
  nfs client: exit_net cleanup check added
  nfs/write: Use common error handling code in nfs_lock_and_join_requests()
  NFSv4: Replace closed stateids with the "invalid special stateid"
  NFSv4: nfs_set_open_stateid must not trigger state recovery for closed state
  NFSv4: Check the open stateid when searching for expired state
  NFSv4: Clean up nfs4_delegreturn_done
  NFSv4: cleanup nfs4_close_done
  NFSv4: Retry NFS4ERR_OLD_STATEID errors in layoutreturn
  pNFS: Retry NFS4ERR_OLD_STATEID errors in layoutreturn-on-close
  NFSv4: Don't try to CLOSE if the stateid 'other' field has changed
  NFSv4: Retry CLOSE and DELEGRETURN on NFS4ERR_OLD_STATEID.
  NFS: Fix a typo in nfs_rename()
  NFSv4: Fix open create exclusive when the server reboots
  ...
parents e0bcb42e fcfa4470

fs/nfs/cache_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ int nfs_cache_upcall(struct cache_detail *cd, char *entry_name) 
 */

void nfs_cache_defer_req_put(struct nfs_cache_defer_req *dreq)

{

	if (atomic_dec_and_test(&dreq->count))

	if (refcount_dec_and_test(&dreq->count))

		kfree(dreq);

}
@@ -87,7 +87,7 @@ static struct cache_deferred_req *nfs_dns_cache_defer(struct cache_req *req) 


	dreq = container_of(req, struct nfs_cache_defer_req, req);

	dreq->deferred_req.revisit = nfs_dns_cache_revisit;

	atomic_inc(&dreq->count);

	refcount_inc(&dreq->count);



	return &dreq->deferred_req;

}
@@ -99,7 +99,7 @@ struct nfs_cache_defer_req *nfs_cache_defer_req_alloc(void) 
	dreq = kzalloc(sizeof(*dreq), GFP_KERNEL);

	if (dreq) {

		init_completion(&dreq->completion);

		atomic_set(&dreq->count, 1);

		refcount_set(&dreq->count, 1);

		dreq->req.defer = nfs_dns_cache_defer;

	}

	return dreq;

fs/nfs/cache_lib.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct nfs_cache_defer_req { 
	struct cache_req req;

	struct cache_deferred_req deferred_req;

	struct completion completion;

	atomic_t count;

	refcount_t count;

};



extern int nfs_cache_upcall(struct cache_detail *cd, char *entry_name);

fs/nfs/callback.c

+7 −7
Original line number Diff line number Diff line
@@ -49,15 +49,15 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) 
	if (ret <= 0)

		goto out_err;

	nn->nfs_callback_tcpport = ret;

	dprintk("NFS: Callback listener port = %u (af %u, net %p)\n",

			nn->nfs_callback_tcpport, PF_INET, net);

	dprintk("NFS: Callback listener port = %u (af %u, net %x)\n",

		nn->nfs_callback_tcpport, PF_INET, net->ns.inum);



	ret = svc_create_xprt(serv, "tcp", net, PF_INET6,

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

	if (ret > 0) {

		nn->nfs_callback_tcpport6 = ret;

		dprintk("NFS: Callback listener port = %u (af %u, net %p)\n",

				nn->nfs_callback_tcpport6, PF_INET6, net);

		dprintk("NFS: Callback listener port = %u (af %u, net %x\n",

			nn->nfs_callback_tcpport6, PF_INET6, net->ns.inum);

	} else if (ret != -EAFNOSUPPORT)

		goto out_err;

	return 0;
@@ -185,7 +185,7 @@ static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struc 
	if (--nn->cb_users[minorversion])

		return;



	dprintk("NFS: destroy per-net callback data; net=%p\n", net);

	dprintk("NFS: destroy per-net callback data; net=%x\n", net->ns.inum);

	svc_shutdown_net(serv, net);

}
@@ -198,7 +198,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, 
	if (nn->cb_users[minorversion]++)

		return 0;



	dprintk("NFS: create per-net callback data; net=%p\n", net);

	dprintk("NFS: create per-net callback data; net=%x\n", net->ns.inum);



	ret = svc_bind(serv, net);

	if (ret < 0) {
@@ -223,7 +223,7 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, 
err_bind:

	nn->cb_users[minorversion]--;

	dprintk("NFS: Couldn't create callback socket: err = %d; "

			"net = %p\n", ret, net);

			"net = %x\n", ret, net->ns.inum);

	return ret;

}

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static bool referring_call_exists(struct nfs_client *clp, 
				  uint32_t nrclists,

				  struct referring_call_list *rclists)

{

	bool status = 0;

	bool status = false;

	int i, j;

	struct nfs4_session *session;

	struct nfs4_slot_table *tbl;

fs/nfs/client.c

+5 −5
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) 


	clp->rpc_ops = clp->cl_nfs_mod->rpc_ops;



	atomic_set(&clp->cl_count, 1);

	refcount_set(&clp->cl_count, 1);

	clp->cl_cons_state = NFS_CS_INITING;



	memcpy(&clp->cl_addr, cl_init->addr, cl_init->addrlen);
@@ -269,7 +269,7 @@ void nfs_put_client(struct nfs_client *clp) 


	nn = net_generic(clp->cl_net, nfs_net_id);



	if (atomic_dec_and_lock(&clp->cl_count, &nn->nfs_client_lock)) {

	if (refcount_dec_and_lock(&clp->cl_count, &nn->nfs_client_lock)) {

		list_del(&clp->cl_share_link);

		nfs_cb_idr_remove_locked(clp);

		spin_unlock(&nn->nfs_client_lock);
@@ -314,7 +314,7 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat 
							   sap))

				continue;



		atomic_inc(&clp->cl_count);

		refcount_inc(&clp->cl_count);

		return clp;

	}

	return NULL;
@@ -1006,7 +1006,7 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, 
	/* Copy data from the source */

	server->nfs_client = source->nfs_client;

	server->destroy = source->destroy;

	atomic_inc(&server->nfs_client->cl_count);

	refcount_inc(&server->nfs_client->cl_count);

	nfs_server_copy_userdata(server, source);



	server->fsid = fattr->fsid;
@@ -1166,7 +1166,7 @@ static int nfs_server_list_show(struct seq_file *m, void *v) 
		   clp->rpc_ops->version,

		   rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_ADDR),

		   rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_PORT),

		   atomic_read(&clp->cl_count),

		   refcount_read(&clp->cl_count),

		   clp->cl_hostname);

	rcu_read_unlock();