Merge tag 'drm-fixes-v4.7-rc1' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / net / ceph / ceph_common.c

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index dcc18c6f7cf9b96c303407c5ac5f13f564bb224d..55d2bfee16d798f6f01ae44c1052e824e590a0d8 100644 (file)
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -651,7 +651,7 @@ EXPORT_SYMBOL(ceph_destroy_client);
 /*
  * true if we have the mon map (and have thus joined the cluster)
  */
-static int have_mon_and_osd_map(struct ceph_client *client)
+static bool have_mon_and_osd_map(struct ceph_client *client)
 {
        return client->monc.monmap && client->monc.monmap->epoch &&
               client->osdc.osdmap && client->osdc.osdmap->epoch;