thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not skip RMW at the end of the file - skipping it may lead to data corruption (fix #116)

Browse Source
This commit is contained in:
Vitaliy Filippov
2025-12-20 18:34:20 +03:00
parent 8b7fa3d3bc
commit 9a02a592e3
1 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nfs/nfs_kv_write.cpp
+17 -25
View File
@@ -505,34 +505,26 @@ static void nfs_do_align_write(nfs_kv_write_state *st, uint64_t ino, uint64_t of
{ {
// Requires read-modify-write in the end // Requires read-modify-write in the end
assert(st->offset+st->size <= st->new_size); assert(st->offset+st->size <= st->new_size);
if (st->offset+st->size == st->new_size) auto s = (end % alignment);
{ if (good_size > s)
// rmw can be skipped at end - we can just zero pad the request good_size -= s;
end_pad = alignment - (end % alignment);
}
else else
good_size = 0;
st->rmw[1] = (nfs_rmw_t){
.parent = st->proxy,
.ino = ino,
.offset = end - s,
.buf = st->buf + st->size - s,
.size = s,
.cb = make_rmw_cb(),
};
if (st->rmw[0].buf)
{ {
auto s = (end % alignment); st->rmw[0].other = &st->rmw[1];
if (good_size > s) st->rmw[1].other = &st->rmw[0];
good_size -= s;
else
good_size = 0;
st->rmw[1] = (nfs_rmw_t){
.parent = st->proxy,
.ino = ino,
.offset = end - s,
.buf = st->buf + st->size - s,
.size = s,
.cb = make_rmw_cb(),
};
if (st->rmw[0].buf)
{
st->rmw[0].other = &st->rmw[1];
st->rmw[1].other = &st->rmw[0];
}
st->waiting++;
nfs_do_rmw(&st->rmw[1]);
} }
st->waiting++;
nfs_do_rmw(&st->rmw[1]);
} }
if (good_size > 0 || end_pad > 0 || begin_shdr) if (good_size > 0 || end_pad > 0 || begin_shdr)
{ {