From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 25 Nov 2016 15:12:45 +0000 (+0800)
Subject: Merge pull request #9172 from majianpeng/librados-add-fullforce
X-Git-Tag: v11.1.0~150
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4862a0e103f9779f48dc759511c636cb2e0f9f15;p=ceph.git

Merge pull request #9172 from majianpeng/librados-add-fullforce

librados:  For C-API, expose LIBRADOS_OPERATION_FULL_FORCE flag

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
---

4862a0e103f9779f48dc759511c636cb2e0f9f15
diff --cc src/include/rados/librados.hpp
index d2284434d8d0,eac0b114b486..2fa997099615
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@@ -278,24 -278,10 +278,26 @@@ namespace librado
      // marked full; ops will either succeed (e.g., delete) or return
      // EDQUOT or ENOSPC
      OPERATION_FULL_TRY           = LIBRADOS_OPERATION_FULL_TRY,
+     //mainly for delete
+     OPERATION_FULL_FORCE	 = LIBRADOS_OPERATION_FULL_FORCE,
    };
  
 +  /*
 +   * Alloc hint flags for the alloc_hint operation.
 +   */
 +  enum AllocHintFlags {
 +    ALLOC_HINT_SEQUENTIAL_WRITE = 1,
 +    ALLOC_HINT_RANDOM_WRITE = 2,
 +    ALLOC_HINT_FLAG_SEQUENTIAL_READ = 4,
 +    ALLOC_HINT_FLAG_RANDOM_READ = 8,
 +    ALLOC_HINT_FLAG_APPEND_ONLY = 16,
 +    ALLOC_HINT_FLAG_IMMUTABLE = 32,
 +    ALLOC_HINT_FLAG_SHORTLIVED = 64,
 +    ALLOC_HINT_FLAG_LONGLIVED = 128,
 +    ALLOC_HINT_FLAG_COMPRESSIBLE = 256,
 +    ALLOC_HINT_FLAG_INCOMPRESSIBLE = 512,
 +  };
 +
    /*
     * ObjectOperation : compound object operation
     * Batch multiple object operations into a single request, to be applied