From: Weston Andros Adamson <dros@netapp.com>
To: Trond.Myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, Weston Andros Adamson <dros@netapp.com>
Subject: [PATCH 09/25] SUNRPC: remove two BUG_ON() asserts
Date: Tue, 16 Oct 2012 12:30:27 -0400 [thread overview]
Message-ID: <1350405043-39316-9-git-send-email-dros@netapp.com> (raw)
In-Reply-To: <1350405043-39316-1-git-send-email-dros@netapp.com>
Replace two BUG_ON() calls checking the RPC_BC_PA_IN_USE flag with
WARN_ON_ONCE().
Signed-off-by: Weston Andros Adamson <dros@netapp.com>
---
net/sunrpc/backchannel_rqst.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c
index 5a3d675..7567bcd 100644
--- a/net/sunrpc/backchannel_rqst.c
+++ b/net/sunrpc/backchannel_rqst.c
@@ -59,7 +59,7 @@ static void xprt_free_allocation(struct rpc_rqst *req)
struct xdr_buf *xbufp;
dprintk("RPC: free allocations for req= %p\n", req);
- BUG_ON(test_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state));
+ WARN_ON_ONCE(test_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state));
xbufp = &req->rq_private_buf;
free_page((unsigned long)xbufp->head[0].iov_base);
xbufp = &req->rq_snd_buf;
@@ -255,7 +255,7 @@ void xprt_free_bc_request(struct rpc_rqst *req)
dprintk("RPC: free backchannel req=%p\n", req);
smp_mb__before_clear_bit();
- BUG_ON(!test_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state));
+ WARN_ON_ONCE(!test_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state));
clear_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state);
smp_mb__after_clear_bit();
--
1.7.9.6 (Apple Git-31.1)
next prev parent reply other threads:[~2012-10-16 16:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-16 16:30 [PATCH 01/25] SUNRPC: remove BUG_ON in __rpc_clnt_handle_event Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 02/25] SUNRPC: remove BUG_ON from rpc_bind_new_program Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 03/25] SUNRPC: remove BUG_ON() from rpc_run_bc_task Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 04/25] SUNRPC: remove BUG_ON() from call_transmit() Weston Andros Adamson
2012-10-18 18:49 ` Myklebust, Trond
2012-10-18 19:10 ` Myklebust, Trond
2012-10-16 16:30 ` [PATCH 05/25] SUNRPC: remove BUG_ON() from rpc_call_sync() Weston Andros Adamson
2012-10-18 18:48 ` Myklebust, Trond
2012-10-18 19:06 ` Myklebust, Trond
2012-10-16 16:30 ` [PATCH 06/25] SUNRPC: remove BUG_ON() from call_bc_transmit() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 07/25] " Weston Andros Adamson
2012-10-18 19:09 ` Myklebust, Trond
2012-10-16 16:30 ` [PATCH 08/25] SUNRPC: remove BUG_ON() from rpc_sleep_on*() Weston Andros Adamson
2012-10-18 18:54 ` Myklebust, Trond
2012-10-16 16:30 ` Weston Andros Adamson [this message]
2012-10-16 16:30 ` [PATCH 10/25] SUNRPC: remove BUG_ON() from xprt_destroy_backchannel Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 11/25] SUNRPC: remove BUG_ON() from bc_send() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 12/25] SUNRPC: remove BUG_ON() calls from cache_read() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 13/25] SUNRPC: remove BUG_ON() in rpc_put_sb_net() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 14/25] SUNRPC: remove BUG_ON() from svc_pool_map_set_cpumask() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 15/25] SUNRPC: remove BUG_ON()s from *_reclassify_socket* Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 16/25] SUNRPC: remove BUG_ON() in svc_xprt_received() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 17/25] SUNRPC: remove BUG_ON()s checking RPCSVC_MAXPAGES Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 18/25] SUNRPC: remove BUG_ON() in xdr_shrink_bufhead() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 19/25] SUNRPC: remove BUG_ON() from bc_malloc() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 20/25] SUNRPC: remove BUG_ON() from encode_rpcb_string() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 21/25] SUNRPC: remove BUG_ON() in svc_register() Weston Andros Adamson
2012-10-18 19:00 ` Myklebust, Trond
2012-10-16 16:30 ` [PATCH 22/25] SUNRPC: remove BUG_ON() from __rpc_sleep_on_priority() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 23/25] SUNRPC: remove BUG_ON()s checking RPC_IS_QUEUED() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 24/25] SUNRPC: remove BUG_ON() in svc_delete_xprt() Weston Andros Adamson
2012-10-16 16:30 ` [PATCH 25/25] SUNRPC: remove BUG_ON() in rpc_release_task() Weston Andros Adamson
-- strict thread matches above, loose matches on Subject: below --
2012-10-23 14:43 [PATCH 00/25] SUNRPC: remove many BUG_ONs Weston Andros Adamson
2012-10-23 14:43 ` [PATCH 09/25] SUNRPC: remove two BUG_ON asserts Weston Andros Adamson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350405043-39316-9-git-send-email-dros@netapp.com \
--to=dros@netapp.com \
--cc=Trond.Myklebust@netapp.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).