diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ceph/osd_client.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index a1af29648fb5..e791b8e46353 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
| @@ -74,7 +74,6 @@ struct ceph_osd_request { | |||
| 74 | char r_oid[40]; /* object name */ | 74 | char r_oid[40]; /* object name */ |
| 75 | int r_oid_len; | 75 | int r_oid_len; |
| 76 | unsigned long r_stamp; /* send OR check time */ | 76 | unsigned long r_stamp; /* send OR check time */ |
| 77 | bool r_resend; /* msg send failed, needs retry */ | ||
| 78 | 77 | ||
| 79 | struct ceph_file_layout r_file_layout; | 78 | struct ceph_file_layout r_file_layout; |
| 80 | struct ceph_snap_context *r_snapc; /* snap context for writes */ | 79 | struct ceph_snap_context *r_snapc; /* snap context for writes */ |
| @@ -104,7 +103,9 @@ struct ceph_osd_client { | |||
| 104 | u64 timeout_tid; /* tid of timeout triggering rq */ | 103 | u64 timeout_tid; /* tid of timeout triggering rq */ |
| 105 | u64 last_tid; /* tid of last request */ | 104 | u64 last_tid; /* tid of last request */ |
| 106 | struct rb_root requests; /* pending requests */ | 105 | struct rb_root requests; /* pending requests */ |
| 107 | struct list_head req_lru; /* pending requests lru */ | 106 | struct list_head req_lru; /* in-flight lru */ |
| 107 | struct list_head req_unsent; /* unsent/need-resend queue */ | ||
| 108 | struct list_head req_notarget; /* map to no osd */ | ||
| 108 | int num_requests; | 109 | int num_requests; |
| 109 | struct delayed_work timeout_work; | 110 | struct delayed_work timeout_work; |
| 110 | struct delayed_work osds_timeout_work; | 111 | struct delayed_work osds_timeout_work; |