diff --git a/[refs] b/[refs] index 4905b7bada24..bff264f315b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60d877334f7d9f5f2417ea4a83c1def769286102 +refs/heads/master: 32c895e776a0dd2cb701d60fbd6440280c09ce35 diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c index d63f192999ee..5d30d5959b97 100644 --- a/trunk/fs/ceph/osd_client.c +++ b/trunk/fs/ceph/osd_client.c @@ -1249,11 +1249,12 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, static void dispatch(struct ceph_connection *con, struct ceph_msg *msg) { struct ceph_osd *osd = con->private; - struct ceph_osd_client *osdc = osd->o_osdc; + struct ceph_osd_client *osdc; int type = le16_to_cpu(msg->hdr.type); if (!osd) return; + osdc = osd->o_osdc; switch (type) { case CEPH_MSG_OSD_MAP: