]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
librbd/cache: undefine dout_subsys before defining it
authorKefu Chai <kchai@redhat.com>
Thu, 2 Apr 2020 04:22:54 +0000 (12:22 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 3 Apr 2020 05:07:51 +0000 (13:07 +0800)
commit0a86c8f6bef4cae3bfdedc678c2a286262e269ca
treee526c0d66fbc1f5a1d35ecdb175ab3225c653073
parent73f4f16c34bf2dc82acc90be26cd0de18aae556a
librbd/cache: undefine dout_subsys before defining it

otherwise we could have following warning from compiler
```
In file included from ../src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:42:
../src/librbd/cache/ImageWriteback.cc:13: warning: "dout_subsys" redefined
   13 | #define dout_subsys ceph_subsys_rbd
      |
In file included from ../src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:39:
../src/librbd/cache/ReplicatedWriteLog.cc:23: note: this is the location of the previous definition
   23 | #define dout_subsys ceph_subsys_rbd_rwl
      |
In file included from ../src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:43:
../src/librbd/cache/rwl/ImageCacheState.cc:12: warning: "dout_subsys" redefined
   12 | #define dout_subsys ceph_subsys_rbd_rwl
      |
In file included from ../src/test/librbd/cache/test_mock_ReplicatedWriteLog.cc:42:
../src/librbd/cache/ImageWriteback.cc:13: note: this is the location of the previous definition
   13 | #define dout_subsys ceph_subsys_rbd
      |
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/librbd/cache/ImageWriteback.cc
src/librbd/cache/ReplicatedWriteLog.cc
src/librbd/cache/rwl/ImageCacheState.cc