Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lustre-release
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
debian-packages
lustre-release
Commits
ad5a8ff3
Commit
ad5a8ff3
authored
16 years ago
by
Bobi Jam
Browse files
Options
Downloads
Patches
Plain Diff
trim trailing white spaces.
parent
62ed8ad1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lustre/ptlrpc/client.c
+20
-20
20 additions, 20 deletions
lustre/ptlrpc/client.c
with
20 additions
and
20 deletions
lustre/ptlrpc/client.c
+
20
−
20
View file @
ad5a8ff3
...
@@ -569,7 +569,7 @@ int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
...
@@ -569,7 +569,7 @@ int ptlrpc_request_bufs_pack(struct ptlrpc_request *request,
EXPORT_SYMBOL
(
ptlrpc_request_bufs_pack
);
EXPORT_SYMBOL
(
ptlrpc_request_bufs_pack
);
int
ptlrpc_request_pack
(
struct
ptlrpc_request
*
request
,
int
ptlrpc_request_pack
(
struct
ptlrpc_request
*
request
,
__u32
version
,
int
opcode
)
__u32
version
,
int
opcode
)
{
{
return
ptlrpc_request_bufs_pack
(
request
,
version
,
opcode
,
NULL
,
NULL
);
return
ptlrpc_request_bufs_pack
(
request
,
version
,
opcode
,
NULL
,
NULL
);
}
}
...
@@ -698,7 +698,7 @@ struct ptlrpc_request_set *ptlrpc_prep_set(void)
...
@@ -698,7 +698,7 @@ struct ptlrpc_request_set *ptlrpc_prep_set(void)
spin_lock_init
(
&
set
->
set_new_req_lock
);
spin_lock_init
(
&
set
->
set_new_req_lock
);
CFS_INIT_LIST_HEAD
(
&
set
->
set_new_requests
);
CFS_INIT_LIST_HEAD
(
&
set
->
set_new_requests
);
CFS_INIT_LIST_HEAD
(
&
set
->
set_cblist
);
CFS_INIT_LIST_HEAD
(
&
set
->
set_cblist
);
RETURN
(
set
);
RETURN
(
set
);
}
}
...
@@ -784,16 +784,16 @@ void ptlrpc_set_add_req(struct ptlrpc_request_set *set,
...
@@ -784,16 +784,16 @@ void ptlrpc_set_add_req(struct ptlrpc_request_set *set,
atomic_inc
(
&
req
->
rq_import
->
imp_inflight
);
atomic_inc
(
&
req
->
rq_import
->
imp_inflight
);
}
}
/**
/**
* Lock so many callers can add things, the context that owns the set
* Lock so many callers can add things, the context that owns the set
* is supposed to notice these and move them into the set proper.
* is supposed to notice these and move them into the set proper.
*/
*/
int
ptlrpc_set_add_new_req
(
struct
ptlrpcd_ctl
*
pc
,
int
ptlrpc_set_add_new_req
(
struct
ptlrpcd_ctl
*
pc
,
struct
ptlrpc_request
*
req
)
struct
ptlrpc_request
*
req
)
{
{
struct
ptlrpc_request_set
*
set
=
pc
->
pc_set
;
struct
ptlrpc_request_set
*
set
=
pc
->
pc_set
;
/*
/*
* Let caller know that we stopped and will not handle this request.
* Let caller know that we stopped and will not handle this request.
* It needs to take care itself of request.
* It needs to take care itself of request.
*/
*/
...
@@ -801,15 +801,15 @@ int ptlrpc_set_add_new_req(struct ptlrpcd_ctl *pc,
...
@@ -801,15 +801,15 @@ int ptlrpc_set_add_new_req(struct ptlrpcd_ctl *pc,
return
-
EALREADY
;
return
-
EALREADY
;
spin_lock
(
&
set
->
set_new_req_lock
);
spin_lock
(
&
set
->
set_new_req_lock
);
/*
/*
* The set takes over the caller's request reference.
* The set takes over the caller's request reference.
*/
*/
list_add_tail
(
&
req
->
rq_set_chain
,
&
set
->
set_new_requests
);
list_add_tail
(
&
req
->
rq_set_chain
,
&
set
->
set_new_requests
);
req
->
rq_set
=
set
;
req
->
rq_set
=
set
;
spin_unlock
(
&
set
->
set_new_req_lock
);
spin_unlock
(
&
set
->
set_new_req_lock
);
/*
/*
* Let thead know that we added something and better it to wake up
* Let thead know that we added something and better it to wake up
* and process.
* and process.
*/
*/
cfs_waitq_signal
(
&
set
->
set_waitq
);
cfs_waitq_signal
(
&
set
->
set_waitq
);
...
@@ -962,7 +962,7 @@ static int after_reply(struct ptlrpc_request *req)
...
@@ -962,7 +962,7 @@ static int after_reply(struct ptlrpc_request *req)
/*
/*
* NB Until this point, the whole of the incoming message,
* NB Until this point, the whole of the incoming message,
* including buflens, status etc is in the sender's byte order.
* including buflens, status etc is in the sender's byte order.
*/
*/
rc
=
sptlrpc_cli_unwrap_reply
(
req
);
rc
=
sptlrpc_cli_unwrap_reply
(
req
);
...
@@ -972,7 +972,7 @@ static int after_reply(struct ptlrpc_request *req)
...
@@ -972,7 +972,7 @@ static int after_reply(struct ptlrpc_request *req)
}
}
/*
/*
* Security layer unwrap might ask resend this request.
* Security layer unwrap might ask resend this request.
*/
*/
if
(
req
->
rq_resend
)
if
(
req
->
rq_resend
)
RETURN
(
0
);
RETURN
(
0
);
...
@@ -1005,7 +1005,7 @@ static int after_reply(struct ptlrpc_request *req)
...
@@ -1005,7 +1005,7 @@ static int after_reply(struct ptlrpc_request *req)
/*
/*
* Either we've been evicted, or the server has failed for
* Either we've been evicted, or the server has failed for
* some reason. Try to reconnect, and if that fails, punt to
* some reason. Try to reconnect, and if that fails, punt to
* the upcall.
* the upcall.
*/
*/
if
(
ll_rpc_recoverable_error
(
rc
))
{
if
(
ll_rpc_recoverable_error
(
rc
))
{
if
(
req
->
rq_send_state
!=
LUSTRE_IMP_FULL
||
if
(
req
->
rq_send_state
!=
LUSTRE_IMP_FULL
||
...
@@ -1017,14 +1017,14 @@ static int after_reply(struct ptlrpc_request *req)
...
@@ -1017,14 +1017,14 @@ static int after_reply(struct ptlrpc_request *req)
}
}
}
else
{
}
else
{
/*
/*
* Let's look if server sent slv. Do it only for RPC with
* Let's look if server sent slv. Do it only for RPC with
* rc == 0.
* rc == 0.
*/
*/
ldlm_cli_update_pool
(
req
);
ldlm_cli_update_pool
(
req
);
}
}
/*
/*
* Store transno in reqmsg for replay.
* Store transno in reqmsg for replay.
*/
*/
req
->
rq_transno
=
lustre_msg_get_transno
(
req
->
rq_repmsg
);
req
->
rq_transno
=
lustre_msg_get_transno
(
req
->
rq_repmsg
);
lustre_msg_set_transno
(
req
->
rq_reqmsg
,
req
->
rq_transno
);
lustre_msg_set_transno
(
req
->
rq_reqmsg
,
req
->
rq_transno
);
...
@@ -1033,10 +1033,10 @@ static int after_reply(struct ptlrpc_request *req)
...
@@ -1033,10 +1033,10 @@ static int after_reply(struct ptlrpc_request *req)
spin_lock
(
&
imp
->
imp_lock
);
spin_lock
(
&
imp
->
imp_lock
);
/*
/*
* No point in adding already-committed requests to the replay
* No point in adding already-committed requests to the replay
* list, we will just remove them immediately. b=9829
* list, we will just remove them immediately. b=9829
*/
*/
if
(
req
->
rq_transno
!=
0
&&
if
(
req
->
rq_transno
!=
0
&&
(
req
->
rq_transno
>
(
req
->
rq_transno
>
lustre_msg_get_last_committed
(
req
->
rq_repmsg
)
||
lustre_msg_get_last_committed
(
req
->
rq_repmsg
)
||
req
->
rq_replay
))
req
->
rq_replay
))
ptlrpc_retain_replayable_request
(
req
,
imp
);
ptlrpc_retain_replayable_request
(
req
,
imp
);
...
@@ -1047,7 +1047,7 @@ static int after_reply(struct ptlrpc_request *req)
...
@@ -1047,7 +1047,7 @@ static int after_reply(struct ptlrpc_request *req)
}
}
/*
/*
* Replay-enabled imports return commit-status information.
* Replay-enabled imports return commit-status information.
*/
*/
if
(
lustre_msg_get_last_committed
(
req
->
rq_repmsg
))
{
if
(
lustre_msg_get_last_committed
(
req
->
rq_repmsg
))
{
imp
->
imp_peer_committed_transno
=
imp
->
imp_peer_committed_transno
=
...
@@ -1069,7 +1069,7 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
...
@@ -1069,7 +1069,7 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
LASSERT
(
req
->
rq_phase
==
RQ_PHASE_NEW
);
LASSERT
(
req
->
rq_phase
==
RQ_PHASE_NEW
);
if
(
req
->
rq_sent
&&
(
req
->
rq_sent
>
cfs_time_current_sec
()))
if
(
req
->
rq_sent
&&
(
req
->
rq_sent
>
cfs_time_current_sec
()))
RETURN
(
0
);
RETURN
(
0
);
req
->
rq_phase
=
RQ_PHASE_RPC
;
req
->
rq_phase
=
RQ_PHASE_RPC
;
imp
=
req
->
rq_import
;
imp
=
req
->
rq_import
;
...
@@ -1455,7 +1455,7 @@ int ptlrpc_expire_one_request(struct ptlrpc_request *req)
...
@@ -1455,7 +1455,7 @@ int ptlrpc_expire_one_request(struct ptlrpc_request *req)
spin_unlock
(
&
req
->
rq_lock
);
spin_unlock
(
&
req
->
rq_lock
);
RETURN
(
1
);
RETURN
(
1
);
}
}
/* if a request can't be resent we can't wait for an answer after
/* if a request can't be resent we can't wait for an answer after
the timeout */
the timeout */
if
(
req
->
rq_no_resend
)
{
if
(
req
->
rq_no_resend
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment