RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

log: remove unused l_written

This commit is contained in:
Thomas Schoebel-Theuer 2019-08-07 14:10:45 +02:00 committed by Thomas Schoebel-Theuer
parent c7f5451501
commit e243706eb1
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/lib_log.c
View File

@ -315,7 +315,6 @@ bool log_finalize(struct log_status *logst, int len, void (*endio)(void *private
{
struct mref_object *mref = logst->log_mref;
struct log_cb_info *cb_info = logst->private;
struct lamport_time now;
void *data;
int offset;
int restlen;
@ -379,9 +378,7 @@ bool log_finalize(struct log_status *logst, int len, void (*endio)(void *private
DATA_PUT(data, offset, (char)0); // spare
DATA_PUT(data, offset, crc_flags);
DATA_PUT(data, offset, logst->seq_nr + 1);
get_lamport(NULL, &now); // when the log entry was ready.
DATA_PUT(data, offset, now.tv_sec);
DATA_PUT(data, offset, now.tv_nsec);
offset += LOG_CHKSUM_SIZE;
if (unlikely(offset > mref->ref_len)) {
MARS_FAT("length calculation was wrong: %d > %d\n", offset, mref->ref_len);
@ -658,8 +655,7 @@ int log_scan(void *buf,
DATA_GET(buf, offset, lh->l_crc_flags);
DATA_GET(buf, offset, lh->l_seq_nr);
DATA_GET(buf, offset, lh->l_written.tv_sec);
DATA_GET(buf, offset, lh->l_written.tv_nsec);
offset += LOG_CHKSUM_SIZE;
if (unlikely(lh->l_seq_nr > *seq_nr + 1 && lh->l_seq_nr && *seq_nr)) {
MARS_ERR(SCAN_TXT "record sequence number %u mismatch, expected was %u\n", SCAN_PAR, lh->l_seq_nr, *seq_nr + 1);

5
kernel/lib_log.h
View File

@ -49,7 +49,6 @@ extern atomic_t global_mref_flying;
struct log_header_v1 {
struct lamport_time l_stamp;
struct lamport_time l_written;
loff_t l_pos;
short l_len;
short l_code;
@ -83,13 +82,15 @@ struct log_header_v1 {
0 \
)
#define LOG_CHKSUM_SIZE (sizeof(__u64) * 2)
#define END_OVERHEAD \
( \
sizeof(END_MAGIC) + \
sizeof(int) + \
sizeof(char) + \
3 + 4 /*spare*/ + \
sizeof(struct lamport_time) + \
LOG_CHKSUM_SIZE + \
0 \
)