diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/ceph/mon_client.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/ceph/mon_client.h')
| -rw-r--r-- | include/linux/ceph/mon_client.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h index 2113e3850a4e..a486f390dfbe 100644 --- a/include/linux/ceph/mon_client.h +++ b/include/linux/ceph/mon_client.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <linux/kref.h> | 5 | #include <linux/kref.h> |
| 6 | #include <linux/rbtree.h> | 6 | #include <linux/rbtree.h> |
| 7 | 7 | ||
| 8 | #include "messenger.h" | 8 | #include <linux/ceph/messenger.h> |
| 9 | 9 | ||
| 10 | struct ceph_client; | 10 | struct ceph_client; |
| 11 | struct ceph_mount_args; | 11 | struct ceph_mount_args; |
| @@ -71,7 +71,6 @@ struct ceph_mon_client { | |||
| 71 | int cur_mon; /* last monitor i contacted */ | 71 | int cur_mon; /* last monitor i contacted */ |
| 72 | unsigned long sub_sent, sub_renew_after; | 72 | unsigned long sub_sent, sub_renew_after; |
| 73 | struct ceph_connection con; | 73 | struct ceph_connection con; |
| 74 | bool have_fsid; | ||
| 75 | 74 | ||
| 76 | /* pending generic requests */ | 75 | /* pending generic requests */ |
| 77 | struct rb_root generic_request_tree; | 76 | struct rb_root generic_request_tree; |