Skip to content

Commit b721f8e

Browse files
committed
Merge PR ceph#64702 into main
* refs/pull/64702/head: Reviewed-by: Milind Changire <[email protected]> Reviewed-by: Venky Shankar <[email protected]>
2 parents bde9154 + ce8ecd3 commit b721f8e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/mds/MDCache.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6657,7 +6657,7 @@ struct C_IO_MDC_TruncateWriteFinish : public MDCacheIOContext {
66576657
LogSegmentRef ls;
66586658
uint32_t block_size;
66596659
C_IO_MDC_TruncateWriteFinish(MDCache *c, CInode *i, LogSegmentRef const& l, uint32_t bs) :
6660-
MDCacheIOContext(c, false), in(i), ls(l), block_size(bs) {
6660+
MDCacheIOContext(c), in(i), ls(l), block_size(bs) {
66616661
}
66626662
void finish(int r) override {
66636663
ceph_assert(r == 0 || r == -ENOENT);
@@ -6672,7 +6672,7 @@ struct C_IO_MDC_TruncateFinish : public MDCacheIOContext {
66726672
CInode *in;
66736673
LogSegmentRef ls;
66746674
C_IO_MDC_TruncateFinish(MDCache *c, CInode *i, LogSegmentRef const& l) :
6675-
MDCacheIOContext(c, false), in(i), ls(l) {
6675+
MDCacheIOContext(c), in(i), ls(l) {
66766676
}
66776677
void finish(int r) override {
66786678
ceph_assert(r == 0 || r == -ENOENT);

src/mds/MDCache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,7 @@ class MDCache {
16141614
* it'ls the lesser of two evils compared with introducing
16151615
* yet another piece of (multiple) inheritance.
16161616
*/
1617-
class MDCacheIOContext : public virtual MDSIOContextBase {
1617+
class MDCacheIOContext : public MDSIOContextBase {
16181618
protected:
16191619
MDCache *mdcache;
16201620
MDSRank *get_mds() override

0 commit comments

Comments
 (0)