diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-01-24 11:54:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-24 12:31:06 -0800 |
| commit | bde8f00ce64d9824a4f227c8594e335a1a10d044 (patch) | |
| tree | 5402180d3aef332c54e7b608f5bb3f94675ffadf /net/sunrpc/clnt.c | |
| parent | 5394cd218735bf462e72bb827fbb7e47fc15f2f0 (diff) | |
| download | linux-stable-bde8f00ce64d9824a4f227c8594e335a1a10d044.tar.gz linux-stable-bde8f00ce64d9824a4f227c8594e335a1a10d044.tar.bz2 linux-stable-bde8f00ce64d9824a4f227c8594e335a1a10d044.zip | |
[PATCH] NFS: Fix Oops in rpc_call_sync()
Fix the Oops in http://bugzilla.linux-nfs.org/show_bug.cgi?id=138
We shouldn't be calling rpc_release_task() for tasks that are not active.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/sunrpc/clnt.c')
| -rw-r--r-- | net/sunrpc/clnt.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index aba528b9ae76..16c9fbc1db69 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -490,16 +490,14 @@ int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags) /* Set up the call info struct and execute the task */ status = task->tk_status; - if (status != 0) { - rpc_release_task(task); + if (status != 0) goto out; - } atomic_inc(&task->tk_count); status = rpc_execute(task); if (status == 0) status = task->tk_status; - rpc_put_task(task); out: + rpc_put_task(task); rpc_restore_sigmask(&oldset); return status; } @@ -537,7 +535,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags, if (status == 0) rpc_execute(task); else - rpc_release_task(task); + rpc_put_task(task); rpc_restore_sigmask(&oldset); return status; |