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

Merge pull request #53030 from petrutlucian94/rbd_tests

Browse Source 
test/librbd/fsx: fix wnbd check

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2023-08-17 11:39:53 +02:00 committed by GitHub
commit 9640080ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/librbd/fsx.cc
View File

@ -209,6 +209,8 @@ FILE * fsxlogf = NULL;
int badoff = -1;
int closeopen = 0;
bool wnbd_disk = false;
void
vwarnc(int code, const char *fmt, va_list ap) {
fprintf(stderr, "fsx: ");
@ -2269,7 +2271,7 @@ doread(unsigned offset, unsigned size)
int ret;
offset -= offset % readbdy;
if (o_direct || ops == &wnbd_operations)
if (o_direct || wnbd_disk)
size -= size % readbdy;
if (size == 0) {
if (!quiet && testcalls > simulatedopcount && !o_direct)
@ -2359,7 +2361,7 @@ dowrite(unsigned offset, unsigned size)
off_t newsize;
offset -= offset % writebdy;
if (o_direct || ops == &wnbd_operations)
if (o_direct || wnbd_disk)
size -= size % writebdy;
if (size == 0) {
if (!quiet && testcalls > simulatedopcount && !o_direct)
@ -3457,6 +3459,7 @@ main(int argc, char **argv)
case 'M':
prt("rbd-wnbd mode enabled\n");
ops = &wnbd_operations;
wnbd_disk = true;
break;
#endif
case 'L':