librados: remove constant for CMPXATTR_NOP

This constant was just added in the public header to match the
operations in rados.h, and was not included in a stable release yet.
NOP is misleading, since it's actually uninterpreted anywhere, and
using it would always return EIO from the OSD. It's not particularly
useful, so just remove it. Adding a cmpxattr with FAIL_OK is
equivalent.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/src/include/rados.h b/src/include/rados.h
index 505676123567d76683289cf50227dd9acc665925..0a09a9752d9537a893443dd0211cd3fef748468c 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -381,7 +381,6 @@ enum {
 
 /* xattr comparison */
 enum {
-       CEPH_OSD_CMPXATTR_OP_NOP = 0,
        CEPH_OSD_CMPXATTR_OP_EQ  = 1,
        CEPH_OSD_CMPXATTR_OP_NE  = 2,
        CEPH_OSD_CMPXATTR_OP_GT  = 3,

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 48a608cfdaacadf293a9be4718f828f9976fe00c..4b4cd45e1e1b3770ff96dbb452357797ca1e9668 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -69,7 +69,6 @@ extern "C" {
  */
 /** @cond TODO_enums_not_yet_in_asphyxiate */
 enum {
-       LIBRADOS_CMPXATTR_OP_NOP = 0,
        LIBRADOS_CMPXATTR_OP_EQ  = 1,
        LIBRADOS_CMPXATTR_OP_NE  = 2,
        LIBRADOS_CMPXATTR_OP_GT  = 3,

diff --git a/wireshark/ceph/rados.h b/wireshark/ceph/rados.h
index 0a99099801a4ec56ad04e0dcbe1e25e28eba2210..7e7fc9234b5d9f91fc9180c18792ab6a43abff44 100644 (file)
--- a/wireshark/ceph/rados.h
+++ b/wireshark/ceph/rados.h
@@ -327,7 +327,6 @@ enum {
 
 /* xattr comparison */
 enum {
-       CEPH_OSD_CMPXATTR_OP_NOP = 0,
        CEPH_OSD_CMPXATTR_OP_EQ  = 1,
        CEPH_OSD_CMPXATTR_OP_NE  = 2,
        CEPH_OSD_CMPXATTR_OP_GT  = 3,