From: Jinyong Ha Date: Mon, 24 May 2021 09:41:15 +0000 (+0900) Subject: seastore: utilize errorator as a return type of discard() X-Git-Tag: v17.1.0~1638^2~15 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=736adb212d00fdd4ca744d52a3d9562aca94bbb7;p=ceph-ci.git seastore: utilize errorator as a return type of discard() Signed-off-by: Jinyong Ha --- diff --git a/src/crimson/os/seastore/nvmedevice/nvmedevice.h b/src/crimson/os/seastore/nvmedevice/nvmedevice.h index c13ec796fc7..87ff56272d3 100644 --- a/src/crimson/os/seastore/nvmedevice/nvmedevice.h +++ b/src/crimson/os/seastore/nvmedevice/nvmedevice.h @@ -125,6 +125,9 @@ using open_ertr = crimson::errorator< using nvme_command_ertr = crimson::errorator< crimson::ct_error::input_output_error>; +using discard_ertr = crimson::errorator< + crimson::ct_error::input_output_error>; + struct io_context_t { iocb cb; bool done = false; @@ -194,7 +197,9 @@ public: uint16_t stream = 0) = 0; // TODO - virtual int discard(uint64_t offset, uint64_t len) { return 0; } + virtual discard_ertr::future<> discard( + uint64_t offset, + uint64_t len) { return seastar::now(); } virtual open_ertr::future<> open( const std::string& path,