libceph: redo callbacks and factor out MOSDOpReply decoding

If you specify ACK | ONDISK and set ->r_unsafe_callback, both
->r_callback and ->r_unsafe_callback(true) are called on ack.  This is
very confusing.  Redo this so that only one of them is called:

    ->r_unsafe_callback(true), on ack
    ->r_unsafe_callback(false), on commit

or

    ->r_callback, on ack|commit

Decode everything in decode_MOSDOpReply() to reduce clutter.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 3bebd60e7f9f..2415dc0cb008 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -162,13 +162,14 @@ struct ceph_osd_request {
         unsigned int            r_num_ops;
 
         int               r_result;
-        int               r_got_reply;
+        bool              r_got_reply;
         int               r_linger;
 
         struct ceph_osd_client *r_osdc;
         struct kref       r_kref;
         bool              r_mempool;
-        struct completion r_completion, r_safe_completion;
+        struct completion r_completion;
+        struct completion r_safe_completion;  /* fsync waiter */
         ceph_osdc_callback_t r_callback;
         ceph_osdc_unsafe_callback_t r_unsafe_callback;
         struct list_head  r_unsafe_item;