summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWeston Andros Adamson <dros@netapp.com>2012-11-01 16:04:40 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-11-04 14:43:43 -0500
commit50d2bdb19734f9e9f21e63881a9b6c8db4cc0eb7 (patch)
treea4d8c39731654e5791a587e471193ca73f664720 /net
parent0a0c2a57bc9a47ae876077fdc4678eca33c26ae4 (diff)
downloadop-kernel-dev-50d2bdb19734f9e9f21e63881a9b6c8db4cc0eb7.zip
op-kernel-dev-50d2bdb19734f9e9f21e63881a9b6c8db4cc0eb7.tar.gz
SUNRPC: remove BUG_ON from rpc_call_sync
Use WARN_ON_ONCE instead of calling BUG_ON and return -EINVAL when RPC_TASK_ASYNC flag is passed to rpc_call_sync. Signed-off-by: Weston Andros Adamson <dros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/clnt.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index a9dd1e8..50bc9db 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -842,7 +842,12 @@ int rpc_call_sync(struct rpc_clnt *clnt, const struct rpc_message *msg, int flag
};
int status;
- BUG_ON(flags & RPC_TASK_ASYNC);
+ WARN_ON_ONCE(flags & RPC_TASK_ASYNC);
+ if (flags & RPC_TASK_ASYNC) {
+ rpc_release_calldata(task_setup_data.callback_ops,
+ task_setup_data.callback_data);
+ return -EINVAL;
+ }
task = rpc_run_task(&task_setup_data);
if (IS_ERR(task))
OpenPOWER on IntegriCloud