Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
b=20038
[fs/lustre-release.git]
/
lustre
/
mdc
/
mdc_lib.c
diff --git
a/lustre/mdc/mdc_lib.c
b/lustre/mdc/mdc_lib.c
index
48b753e
..
aea8c87
100644
(file)
--- a/
lustre/mdc/mdc_lib.c
+++ b/
lustre/mdc/mdc_lib.c
@@
-493,9
+493,9
@@
static int mdc_req_avail(struct client_obd *cli, struct mdc_cache_waiter *mcw)
{
int rc;
ENTRY;
-
spin
_lock(&cli->cl_loi_list_lock);
+
client_obd_list
_lock(&cli->cl_loi_list_lock);
rc = list_empty(&mcw->mcw_entry);
-
spin
_unlock(&cli->cl_loi_list_lock);
+
client_obd_list
_unlock(&cli->cl_loi_list_lock);
RETURN(rc);
};
@@
-507,15
+507,15
@@
void mdc_enter_request(struct client_obd *cli)
struct mdc_cache_waiter mcw;
struct l_wait_info lwi = { 0 };
-
spin
_lock(&cli->cl_loi_list_lock);
+
client_obd_list
_lock(&cli->cl_loi_list_lock);
if (cli->cl_r_in_flight >= cli->cl_max_rpcs_in_flight) {
list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters);
cfs_waitq_init(&mcw.mcw_waitq);
-
spin
_unlock(&cli->cl_loi_list_lock);
+
client_obd_list
_unlock(&cli->cl_loi_list_lock);
l_wait_event(mcw.mcw_waitq, mdc_req_avail(cli, &mcw), &lwi);
} else {
cli->cl_r_in_flight++;
-
spin
_unlock(&cli->cl_loi_list_lock);
+
client_obd_list
_unlock(&cli->cl_loi_list_lock);
}
}
@@
-524,7
+524,7
@@
void mdc_exit_request(struct client_obd *cli)
struct list_head *l, *tmp;
struct mdc_cache_waiter *mcw;
-
spin
_lock(&cli->cl_loi_list_lock);
+
client_obd_list
_lock(&cli->cl_loi_list_lock);
cli->cl_r_in_flight--;
list_for_each_safe(l, tmp, &cli->cl_cache_waiters) {
@@
-540,5
+540,5
@@
void mdc_exit_request(struct client_obd *cli)
}
/* Empty waiting list? Decrease reqs in-flight number */
-
spin
_unlock(&cli->cl_loi_list_lock);
+
client_obd_list
_unlock(&cli->cl_loi_list_lock);
}