Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[firefly-linux-kernel-4.4.55.git] / include / linux / ceph / mon_client.h

diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h
index 2113e3850a4e0c7e088b22b07092baf2616654a5..a486f390dfbeeb9d4004921bb973852bd586a808 100644 (file)
--- a/include/linux/ceph/mon_client.h
+++ b/include/linux/ceph/mon_client.h
@@ -5,7 +5,7 @@
 #include <linux/kref.h>
 #include <linux/rbtree.h>
 
-#include "messenger.h"
+#include <linux/ceph/messenger.h>
 
 struct ceph_client;
 struct ceph_mount_args;
@@ -71,7 +71,6 @@ struct ceph_mon_client {
        int cur_mon;                       /* last monitor i contacted */
        unsigned long sub_sent, sub_renew_after;
        struct ceph_connection con;
-       bool have_fsid;
 
        /* pending generic requests */
        struct rb_root generic_request_tree;