diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2017-02-11 12:46:08 -0500 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2017-02-24 13:04:57 -0500 |
| commit | b18b9550e4059ceea0393c518eb323b95243f92f (patch) | |
| tree | 4401ab6439dea8ced7d5c49039c3aa981034d444 /include/linux/ceph | |
| parent | 55f2a04588c5881d90e22631b17a84cd25d17cc4 (diff) | |
libceph: get rid of ack vs commit
- CEPH_OSD_FLAG_ACK shouldn't be set anymore, so assert on it
- remove support for handling ack replies (OSDs will send ack replies
only if clients request them)
- drop the "do lingering callbacks under osd->lock" logic from
handle_reply() -- lreq->lock is sufficient in all three cases
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/osd_client.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 03a6653d329a..2ea0c282f3dc 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
| @@ -22,7 +22,6 @@ struct ceph_osd_client; | |||
| 22 | * completion callback for async writepages | 22 | * completion callback for async writepages |
| 23 | */ | 23 | */ |
| 24 | typedef void (*ceph_osdc_callback_t)(struct ceph_osd_request *); | 24 | typedef void (*ceph_osdc_callback_t)(struct ceph_osd_request *); |
| 25 | typedef void (*ceph_osdc_unsafe_callback_t)(struct ceph_osd_request *, bool); | ||
| 26 | 25 | ||
| 27 | #define CEPH_HOMELESS_OSD -1 | 26 | #define CEPH_HOMELESS_OSD -1 |
| 28 | 27 | ||
| @@ -170,15 +169,12 @@ struct ceph_osd_request { | |||
| 170 | unsigned int r_num_ops; | 169 | unsigned int r_num_ops; |
| 171 | 170 | ||
| 172 | int r_result; | 171 | int r_result; |
| 173 | bool r_got_reply; | ||
| 174 | 172 | ||
| 175 | struct ceph_osd_client *r_osdc; | 173 | struct ceph_osd_client *r_osdc; |
| 176 | struct kref r_kref; | 174 | struct kref r_kref; |
| 177 | bool r_mempool; | 175 | bool r_mempool; |
| 178 | struct completion r_completion; | 176 | struct completion r_completion; /* private to osd_client.c */ |
| 179 | struct completion r_done_completion; /* fsync waiter */ | ||
| 180 | ceph_osdc_callback_t r_callback; | 177 | ceph_osdc_callback_t r_callback; |
| 181 | ceph_osdc_unsafe_callback_t r_unsafe_callback; | ||
| 182 | struct list_head r_unsafe_item; | 178 | struct list_head r_unsafe_item; |
| 183 | 179 | ||
| 184 | struct inode *r_inode; /* for use by callbacks */ | 180 | struct inode *r_inode; /* for use by callbacks */ |
