Skip to content

Fix bugs on superblock.cc for O_DIRECT #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix bugs on superblock.cc for O_DIRECT #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e074e4
Fix bugs on superblock.cc for O_DIRECT
wurikiji Mar 31, 2016
1ff4628
mend
wurikiji Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/superblock.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,13 +1120,16 @@ fdb_status sb_write(struct filemgr *file, size_t sb_no,
int r;
int real_blocksize = file->blocksize;
int blocksize = file->blocksize - BLK_MARKER_SIZE;
uint8_t *buf = alca(uint8_t, real_blocksize);
uint8_t *buf;
uint32_t crc, _crc;
uint64_t enc_u64;
uint64_t num_docs;
size_t i, offset;
fdb_status fs;
void *temp;

malloc_align(temp, FDB_SECTOR_SIZE, real_blocksize);
buf = (uint8_t *)temp;
memset(buf, 0x0, real_blocksize);

offset = 0;
Expand Down Expand Up @@ -1235,6 +1238,8 @@ fdb_status sb_write(struct filemgr *file, size_t sb_no,

// directly write a block bypassing block cache
r = file->ops->pwrite(file->fd, buf, real_blocksize, sb_no * real_blocksize);

free_align(temp);
if (r != real_blocksize) {
char errno_msg[512];
file->ops->get_errno_str(errno_msg, 512);
Expand All @@ -1260,12 +1265,15 @@ static fdb_status _sb_read_given_no(struct filemgr *file,
int real_blocksize = file->blocksize;
int blocksize = file->blocksize - BLK_MARKER_SIZE;
size_t i, num_docs;
uint8_t *buf = alca(uint8_t, real_blocksize);
uint8_t *buf;
uint32_t crc_file, crc, _crc;
uint64_t enc_u64, version, offset, dummy64;
fdb_status fs;
struct sb_rsv_bmp *rsv = NULL;
void *temp;

malloc_align(temp, FDB_SECTOR_SIZE, real_blocksize);
buf = (uint8_t *)temp;
memset(buf, 0x0, real_blocksize);
offset = 0;

Expand All @@ -1278,6 +1286,7 @@ static fdb_status _sb_read_given_no(struct filemgr *file,
fdb_log(log_callback, fs,
"Failed to read the superblock: file read failure (SB No.: %" _F64 "), %s",
sb_no, errno_msg);
free_align(temp);
return fs;
}

Expand All @@ -1288,6 +1297,7 @@ static fdb_status _sb_read_given_no(struct filemgr *file,
"Failed to read the superblock: "
"incorrect block marker (marker: %x, SB No.: %" _F64 ")",
buf[blocksize], sb_no);
free_align(temp);
return fs;
}

Expand All @@ -1303,6 +1313,7 @@ static fdb_status _sb_read_given_no(struct filemgr *file,
"Failed to read the superblock: "
"not supported version (magic: %" _F64 ", SB No.: %" _F64 ")",
version, sb_no);
free_align(temp);
return fs;
}

Expand Down Expand Up @@ -1408,6 +1419,7 @@ static fdb_status _sb_read_given_no(struct filemgr *file,
crc = get_checksum(buf, offset, file->crc_mode);
memcpy(&_crc, buf + offset, sizeof(_crc));
crc_file = _endian_decode(_crc);
free_align(temp);
if (crc != crc_file) {
free(sb->bmp_doc_offset);
free(sb->bmp_docs);
Expand Down