Merge pull request #38538 from chenerqi/qos-skip-discard

librbd: optionally exclude ops from qos

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc src/CMakeLists.txt
index 8f0bb60e1562aa13b455b5c053a8a091de890f56,05235b691852c19a46ce28f6db3724323abfdbd8..d76aca4ff653611a09646f34da12288551de3cad
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -385,10 -385,8 +385,11 @@@ set(libcommon_file
    osdc/Objecter.cc
    osdc/error_code.cc
    librbd/Features.cc
+   librbd/io/IoOperations.cc
    ${mds_files})
 +if(WITH_JAEGER)
 +  list(APPEND libcommon_files common/tracer.cc)
 +endif()
  set_source_files_properties(ceph_ver.c
    APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/src/include/ceph_ver.h)
  add_library(common-objs OBJECT ${libcommon_files})

diff --cc src/common/options.cc
Simple merge

diff --cc src/crimson/CMakeLists.txt
Simple merge

diff --cc src/librbd/CMakeLists.txt
Simple merge

diff --cc src/librbd/ImageCtx.cc
Simple merge

diff --cc src/librbd/io/ImageDispatcher.cc
Simple merge

diff --cc src/librbd/io/ImageDispatcher.h
Simple merge

diff --cc src/librbd/io/ImageDispatcherInterface.h
Simple merge

diff --cc src/test/librbd/mock/io/MockImageDispatcher.h
Simple merge