Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192339
b: refs/heads/master
c: 9bb0b81
h: refs/heads/master
i:
  192337: dc2c17a
  192335: 7c34067
v: v3
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed May 14, 2010
1 parent 5a7636d commit 35a6ff7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d72b6cec8d42eb7c2a249b613abf2c2b7a6eeb47
refs/heads/master: 9bb0b8136a7d5b50c5807af3bf12b758fb257814
12 changes: 6 additions & 6 deletions trunk/include/linux/sunrpc/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,11 @@ struct rpc_task {
struct list_head tk_task; /* global list of tasks */
struct rpc_clnt * tk_client; /* RPC client */
struct rpc_rqst * tk_rqstp; /* RPC request */
int tk_status; /* result of last operation */

/*
* RPC call state
*/
struct rpc_message tk_msg; /* RPC call info */
__u8 tk_garb_retry;
__u8 tk_cred_retry;

/*
* callback to be executed after waking up
Expand All @@ -65,7 +62,6 @@ struct rpc_task {
void * tk_calldata;

unsigned long tk_timeout; /* timeout for rpc_sleep() */
unsigned short tk_flags; /* misc flags */
unsigned long tk_runstate; /* Task run status */
struct workqueue_struct *tk_workqueue; /* Normally rpciod, but could
* be any workqueue
Expand All @@ -76,15 +72,19 @@ struct rpc_task {
struct rpc_wait tk_wait; /* RPC wait */
} u;

unsigned short tk_timeouts; /* maj timeouts */
ktime_t tk_start; /* RPC task init timestamp */

pid_t tk_owner; /* Process id for batching tasks */
unsigned char tk_priority : 2;/* Task priority */
int tk_status; /* result of last operation */
unsigned short tk_flags; /* misc flags */
unsigned short tk_timeouts; /* maj timeouts */

#ifdef RPC_DEBUG
unsigned short tk_pid; /* debugging aid */
#endif
unsigned char tk_priority : 2,/* Task priority */
tk_garb_retry : 2,
tk_cred_retry : 2;
};
#define tk_xprt tk_client->cl_xprt

Expand Down

0 comments on commit 35a6ff7

Please sign in to comment.