RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-14 06:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28761 from lixiaoy1/pmem_osd

Browse Source 
os/bluestore: fix pmem osd build problem

Reviewed-by: Jason Dillaman <dllaman@redhat.com>
This commit is contained in:
Jason Dillaman 2019-06-28 07:42:43 -04:00 committed by GitHub
commit a28d3207e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/bluestore/PMEMDevice.cc
View File

@ -143,7 +143,7 @@ int PMEMDevice::collect_metadata(const string& prefix, map<string,string> *pm) c
if (S_ISBLK(st.st_mode)) {
(*pm)[prefix + "access_mode"] = "blk";
char buffer[1024] = {0};
BlkDev blkdev(fd_buffered);
BlkDev blkdev(fd);
blkdev.model(buffer, sizeof(buffer));
(*pm)[prefix + "model"] = buffer;
@ -184,7 +184,7 @@ void PMEMDevice::aio_submit(IOContext *ioc)
return;
}
int PMEMDevice::write(uint64_t off, bufferlist& bl, bool buffered, int write_hint = WRITE_LIFE_NOT_SET)
int PMEMDevice::write(uint64_t off, bufferlist& bl, bool buffered, int write_hint)
{
uint64_t len = bl.length();
dout(20) << __func__ << " " << off << "~" << len << dendl;
@ -219,7 +219,7 @@ int PMEMDevice::aio_write(
bufferlist &bl,
IOContext *ioc,
bool buffered,
int write_hint = WRITE_LIFE_NOT_SET)
int write_hint)
{
return write(off, bl, buffered);
}