summaryrefslogtreecommitdiffstats
path: root/include/linux/ceph
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-05-26 23:26:43 -0500
committerAlex Elder <elder@dreamhost.com>2012-06-06 09:23:54 -0500
commit67130934fb579fdf0f2f6d745960264378b57dc8 (patch)
tree5b0f5eaa9d3fd24ba30368911c3a157acd2b9e33 /include/linux/ceph
parent0d47766f14211a73eaf54cab234db134ece79f49 (diff)
downloadblackbird-obmc-linux-67130934fb579fdf0f2f6d745960264378b57dc8.tar.gz
blackbird-obmc-linux-67130934fb579fdf0f2f6d745960264378b57dc8.zip
libceph: embed ceph connection structure in mon_client
A monitor client has a pointer to a ceph connection structure in it. This is the only one of the three ceph client types that do it this way; the OSD and MDS clients embed the connection into their main structures. There is always exactly one ceph connection for a monitor client, so there is no need to allocate it separate from the monitor client structure. So switch the ceph_mon_client structure to embed its ceph_connection structure. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'include/linux/ceph')
-rw-r--r--include/linux/ceph/mon_client.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h
index 545f85917780..2113e3850a4e 100644
--- a/include/linux/ceph/mon_client.h
+++ b/include/linux/ceph/mon_client.h
@@ -70,7 +70,7 @@ struct ceph_mon_client {
bool hunting;
int cur_mon; /* last monitor i contacted */
unsigned long sub_sent, sub_renew_after;
- struct ceph_connection *con;
+ struct ceph_connection con;
bool have_fsid;
/* pending generic requests */
OpenPOWER on IntegriCloud