Skip to content

Commit

Permalink
Merge pull request ceph#21136 from kungf/io_events
Browse files Browse the repository at this point in the history
bluestore: fix aio_t::rval  type

Reviewed-by: Dongsheng Yang <[email protected]>
Reviewed-by: xie xingguo <[email protected]>
Reviewed-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov authored Apr 2, 2018
2 parents 6a981eb + a9b9477 commit d824357
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/os/bluestore/KernelDevice.cc
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ void KernelDevice::_aio_thread()
// later flush() occurs.
io_since_flush.store(true);

int r = aio[i]->get_return_value();
long r = aio[i]->get_return_value();
if (r < 0) {
derr << __func__ << " got " << cpp_strerror(r) << dendl;
if (ioc->allow_eio && r == -EIO) {
Expand Down
4 changes: 2 additions & 2 deletions src/os/bluestore/aio.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct aio_t {
int fd;
boost::container::small_vector<iovec,4> iov;
uint64_t offset, length;
int rval;
long rval;
bufferlist bl; ///< write payload (so that it remains stable for duration)

boost::intrusive::list_member_hook<> queue_item;
Expand All @@ -37,7 +37,7 @@ struct aio_t {
bl.append(std::move(p));
}

int get_return_value() {
long get_return_value() {
return rval;
}
};
Expand Down

0 comments on commit d824357

Please sign in to comment.