Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
e60859ac
Commit
e60859ac
authored
Jan 03, 2006
by
Trond Myklebust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SUNRPC: rpc_execute should not return task->tk_status;
Signed-off-by:
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
parent
89991c24
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
net/sunrpc/clnt.c
net/sunrpc/clnt.c
+6
-5
net/sunrpc/sched.c
net/sunrpc/sched.c
+1
-3
No files found.
net/sunrpc/clnt.c
View file @
e60859ac
...
@@ -446,14 +446,15 @@ int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
...
@@ -446,14 +446,15 @@ int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
rpc_call_setup
(
task
,
msg
,
0
);
rpc_call_setup
(
task
,
msg
,
0
);
/* Set up the call info struct and execute the task */
/* Set up the call info struct and execute the task */
if
(
task
->
tk_status
==
0
)
{
status
=
task
->
tk_status
;
if
(
status
==
0
)
{
atomic_inc
(
&
task
->
tk_count
);
status
=
rpc_execute
(
task
);
status
=
rpc_execute
(
task
);
}
else
{
if
(
status
==
0
)
status
=
task
->
tk_status
;
status
=
task
->
tk_status
;
rpc_release_task
(
task
);
}
}
rpc_restore_sigmask
(
&
oldset
);
rpc_restore_sigmask
(
&
oldset
);
rpc_release_task
(
task
);
out:
out:
return
status
;
return
status
;
}
}
...
...
net/sunrpc/sched.c
View file @
e60859ac
...
@@ -694,9 +694,7 @@ static int __rpc_execute(struct rpc_task *task)
...
@@ -694,9 +694,7 @@ static int __rpc_execute(struct rpc_task *task)
dprintk
(
"RPC: %4d sync task resuming
\n
"
,
task
->
tk_pid
);
dprintk
(
"RPC: %4d sync task resuming
\n
"
,
task
->
tk_pid
);
}
}
dprintk
(
"RPC: %4d exit() = %d
\n
"
,
task
->
tk_pid
,
task
->
tk_status
);
dprintk
(
"RPC: %4d, return %d, status %d
\n
"
,
task
->
tk_pid
,
status
,
task
->
tk_status
);
status
=
task
->
tk_status
;
/* Wake up anyone who is waiting for task completion */
/* Wake up anyone who is waiting for task completion */
rpc_mark_complete_task
(
task
);
rpc_mark_complete_task
(
task
);
/* Release all resources associated with the task */
/* Release all resources associated with the task */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment