import quincy beta 17.1.0

[ceph.git] / ceph / src / include / rados / librados.h

diff --git a/ceph/src/include/rados/librados.h b/ceph/src/include/rados/librados.h
index d9e39eceb1f9e96cfe5a984738f2cc0853409849..31ef332403ce207a688dcb185cb9d53ae6a49f0b 100644 (file)
--- a/ceph/src/include/rados/librados.h
+++ b/ceph/src/include/rados/librados.h
@@ -167,8 +167,8 @@ typedef enum {
 /*
  * snap id contants
  */
-#define LIBRADOS_SNAP_HEAD  ((uint64_t)(-2))
-#define LIBRADOS_SNAP_DIR   ((uint64_t)(-1))
+#define LIBRADOS_SNAP_HEAD  UINT64_C(-2)
+#define LIBRADOS_SNAP_DIR   UINT64_C(-1)
 
 /**
  * @typedef rados_t
@@ -2381,7 +2381,7 @@ typedef void (*rados_watchcb_t)(uint8_t opcode, uint64_t ver, void *arg);
  * @param handle the watcher handle we are notifying
  * @param notifier_id the unique client id for the notifier
  * @param data payload from the notifier
- * @param datalen length of payload buffer
+ * @param data_len length of payload buffer
  */
 typedef void (*rados_watchcb2_t)(void *arg,
                                 uint64_t notify_id,
@@ -2400,6 +2400,7 @@ typedef void (*rados_watchcb2_t)(void *arg,
  * we may have missed notify events.
  *
  * @param pre opaque user-defined value provided to rados_watch2()
+ * @param cookie the internal id assigned to the watch session
  * @param err error code
  */
   typedef void (*rados_watcherrcb_t)(void *pre, uint64_t cookie, int err);