summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-02-19 14:38:33 -0800
committerSage Weil <sage@newdream.net>2009-02-19 14:38:33 -0800
commite92f0a60c1f9e5599d506ce8ec3233920b3199c8 (patch)
tree9a8b04aa27b062fe104811c9b7f2d97eb5a5b5df
parent15b2d60d49393dd1c287b47e808cd60cae6eaa0d (diff)
downloadceph-e92f0a60c1f9e5599d506ce8ec3233920b3199c8.tar.gz
kclient: add missing r_wait list_head init
-rw-r--r--src/kernel/mds_client.c1
-rw-r--r--src/kernel/mds_client.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index 69f09abfbf0..86df0aa043c 100644
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -851,6 +851,7 @@ ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op,
INIT_LIST_HEAD(&req->r_listener_item);
req->r_fmode = -1;
atomic_set(&req->r_ref, 1); /* one for request_tree, one for caller */
+ INIT_LIST_HEAD(&req->r_wait);
init_completion(&req->r_completion);
init_completion(&req->r_safe_completion);
INIT_LIST_HEAD(&req->r_unsafe_item);
diff --git a/src/kernel/mds_client.h b/src/kernel/mds_client.h
index 870cf377686..7b07a63102f 100644
--- a/src/kernel/mds_client.h
+++ b/src/kernel/mds_client.h
@@ -162,8 +162,6 @@ struct ceph_mds_request {
unsigned long r_request_started; /* start time for mds request only,
used to measure lease durations */
- struct list_head r_wait;
-
/* for choosing which mds to send this request to */
int r_direct_mode;
u32 r_direct_hash; /* choose dir frag based on this dentry hash */
@@ -187,6 +185,7 @@ struct ceph_mds_request {
int r_resend_mds; /* mds to resend to next, if any*/
atomic_t r_ref;
+ struct list_head r_wait;
struct completion r_completion;
struct completion r_safe_completion;
ceph_mds_request_callback_t r_callback;