From c8c2e535be11c78ea8363b60449328f5a308d7c0 Mon Sep 17 00:00:00 2001
From: Weston Andros Adamson <dros@netapp.com>
Date: Tue, 23 Oct 2012 10:43:46 -0400
Subject: [PATCH] --- yaml --- r: 346566 b: refs/heads/master c:
 f50ad42837eb874c1a0cd7cca2001364b06f7ac4 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/sunrpc/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 453d6e711dbd..55fab017a43e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0af39507f60ee9f98b20f24af09c1a60655417ac
+refs/heads/master: f50ad42837eb874c1a0cd7cca2001364b06f7ac4
diff --git a/trunk/net/sunrpc/sched.c b/trunk/net/sunrpc/sched.c
index f494b356e876..e6db49699bce 100644
--- a/trunk/net/sunrpc/sched.c
+++ b/trunk/net/sunrpc/sched.c
@@ -334,7 +334,7 @@ static void __rpc_sleep_on_priority(struct rpc_wait_queue *q,
 
 	__rpc_add_wait_queue(q, task, queue_priority);
 
-	BUG_ON(task->tk_callback != NULL);
+	WARN_ON_ONCE(task->tk_callback != NULL);
 	task->tk_callback = action;
 	__rpc_add_timer(q, task);
 }