RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 01:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw_file: fix write error when the write offset overlaps.

Browse Source 
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
This commit is contained in:
Yao Zongyou 2017-09-24 22:11:22 +08:00
parent 4639b96cae
commit 872d73f945
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rgw/rgw_file.cc
View File

@ -1159,6 +1159,15 @@ namespace rgw {
}
}
int overlap = 0;
if ((static_cast<off_t>(off) < f->write_req->real_ofs) &&
((f->write_req->real_ofs - off) <= len)) {
overlap = f->write_req->real_ofs - off;
off = f->write_req->real_ofs;
buffer = static_cast<char*>(buffer) + overlap;
len -= overlap;
}
buffer::list bl;
/* XXXX */
#if 0
@ -1195,7 +1204,7 @@ namespace rgw {
rc = -EIO;
}
*bytes_written = (rc == 0) ? len : 0;
*bytes_written = (rc == 0) ? (len + overlap) : 0;
return rc;
} /* RGWFileHandle::write */