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

Commit 1602a7b7 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

SUNRPC: Don't allow compiler optimisation of svc_xprt_release_slot() 



Use READ_ONCE() to tell the compiler to not optimse away the read of
xprt->xpt_flags in svc_xprt_release_slot().

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 1c3da445

net/sunrpc/svc_xprt.c

+6 −2
Original line number Diff line number Diff line
@@ -363,9 +363,13 @@ static void svc_xprt_release_slot(struct svc_rqst *rqstp) 


static bool svc_xprt_has_something_to_do(struct svc_xprt *xprt)

{

	if (xprt->xpt_flags & ((1<<XPT_CONN)|(1<<XPT_CLOSE)))

	unsigned long xpt_flags;



	xpt_flags = READ_ONCE(xprt->xpt_flags);



	if (xpt_flags & (BIT(XPT_CONN) | BIT(XPT_CLOSE)))

		return true;

	if (xprt->xpt_flags & ((1<<XPT_DATA)|(1<<XPT_DEFERRED))) {

	if (xpt_flags & (BIT(XPT_DATA) | BIT(XPT_DEFERRED))) {

		if (xprt->xpt_ops->xpo_has_wspace(xprt) &&

		    svc_xprt_slots_in_range(xprt))

			return true;