SUNRPC: Make NFS swap work with multipath (15001e5a) · Commits · e / devices / android_kernel_fairphone_FP4

net/sunrpc/clnt.c

+24 −42

Original line number	Original line	Diff line number	Diff line
	@@ -2554,57 +2554,39 @@ void rpc_show_tasks(struct net *net)
	#endif		#endif

	#if IS_ENABLED(CONFIG_SUNRPC_SWAP)		#if IS_ENABLED(CONFIG_SUNRPC_SWAP)
			static int
			rpc_clnt_swap_activate_callback(struct rpc_clnt *clnt,
			struct rpc_xprt *xprt,
			void *dummy)
			{
			return xprt_enable_swap(xprt);
			}

	int		int
	rpc_clnt_swap_activate(struct rpc_clnt *clnt)		rpc_clnt_swap_activate(struct rpc_clnt *clnt)
	{		{
	int ret = 0;		if (atomic_inc_return(&clnt->cl_swapper) == 1)
	struct rpc_xprt *xprt;		return rpc_clnt_iterate_for_each_xprt(clnt,
			rpc_clnt_swap_activate_callback, NULL);
	if (atomic_inc_return(&clnt->cl_swapper) == 1) {		return 0;
	retry:
	rcu_read_lock();
	xprt = xprt_get(rcu_dereference(clnt->cl_xprt));
	rcu_read_unlock();
	if (!xprt) {
	/*
	* If we didn't get a reference, then we likely are
	* racing with a migration event. Wait for a grace
	* period and try again.
	*/
	synchronize_rcu();
	goto retry;
	}		}
			EXPORT_SYMBOL_GPL(rpc_clnt_swap_activate);

	ret = xprt_enable_swap(xprt);		static int
	xprt_put(xprt);		rpc_clnt_swap_deactivate_callback(struct rpc_clnt *clnt,
	}		struct rpc_xprt *xprt,
	return ret;		void *dummy)
			{
			xprt_disable_swap(xprt);
			return 0;
	}		}
	EXPORT_SYMBOL_GPL(rpc_clnt_swap_activate);

	void		void
	rpc_clnt_swap_deactivate(struct rpc_clnt *clnt)		rpc_clnt_swap_deactivate(struct rpc_clnt *clnt)
	{		{
	struct rpc_xprt *xprt;		if (atomic_dec_if_positive(&clnt->cl_swapper) == 0)
			rpc_clnt_iterate_for_each_xprt(clnt,
	if (atomic_dec_if_positive(&clnt->cl_swapper) == 0) {		rpc_clnt_swap_deactivate_callback, NULL);
	retry:
	rcu_read_lock();
	xprt = xprt_get(rcu_dereference(clnt->cl_xprt));
	rcu_read_unlock();
	if (!xprt) {
	/*
	* If we didn't get a reference, then we likely are
	* racing with a migration event. Wait for a grace
	* period and try again.
	*/
	synchronize_rcu();
	goto retry;
	}

	xprt_disable_swap(xprt);
	xprt_put(xprt);
	}
	}		}
	EXPORT_SYMBOL_GPL(rpc_clnt_swap_deactivate);		EXPORT_SYMBOL_GPL(rpc_clnt_swap_deactivate);
	#endif /* CONFIG_SUNRPC_SWAP */		#endif /* CONFIG_SUNRPC_SWAP */