From: Adam C. Emerson Date: Tue, 21 Jul 2020 16:39:02 +0000 (-0400) Subject: Merge pull request #36149 from adamemerson/wip-warn-more X-Git-Tag: v16.1.0~1661 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1613d272f43f11c444da3e53de96415d6968659a;p=ceph.git Merge pull request #36149 from adamemerson/wip-warn-more Warning Cleanup Reviewed-by: Kefu Chai Reviewed-by: Jason Dillaman --- 1613d272f43f11c444da3e53de96415d6968659a diff --cc src/librbd/io/ObjectRequest.cc index 22c4b8ed046b,bacc6234b18e..1b2cf9119c62 --- a/src/librbd/io/ObjectRequest.cc +++ b/src/librbd/io/ObjectRequest.cc @@@ -21,9 -19,7 +21,8 @@@ #include "librbd/io/CopyupRequest.h" #include "librbd/io/ImageRequest.h" #include "librbd/io/ReadResult.h" +#include "librbd/io/Utils.h" - #include #include #define dout_subsys ceph_subsys_rbd