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

Fix missing --readonly handling in NBD server

Browse Source
This commit is contained in:
Vitaliy Filippov
2026-06-20 11:52:29 +03:00
parent 8c0486bd76
commit 716527b184
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/nbd_proxy.cpp
+6 -6
View File
@@ -301,10 +301,9 @@ const char *help_text =
" --nbd_disconnect_on_close 1\n" " --nbd_disconnect_on_close 1\n"
" Disconnect the nbd device on close by last opener.\n" " Disconnect the nbd device on close by last opener.\n"
#endif #endif
#ifdef NBD_FLAG_READ_ONLY " --readonly\n"
" --nbd_ro 1\n" " --nbd_ro 1\n"
" Set device into read only mode.\n" " Set device into read only mode.\n"
#endif
"\n" "\n"
"vitastor-nbd netlink-unmap /dev/nbdN\n" "vitastor-nbd netlink-unmap /dev/nbdN\n"
" Unmap a device using netlink interface. Works with both netlink and ioctl mapped devices.\n" " Unmap a device using netlink interface. Works with both netlink and ioctl mapped devices.\n"
@@ -582,10 +581,8 @@ help:
} }
uint64_t flags = NBD_FLAG_SEND_FLUSH; uint64_t flags = NBD_FLAG_SEND_FLUSH;
uint64_t cflags = 0; uint64_t cflags = 0;
#ifdef NBD_FLAG_READ_ONLY if (!cfg["readonly"].is_null() || !cfg["nbd_ro"].is_null())
if (!cfg["nbd_ro"].is_null())
flags |= NBD_FLAG_READ_ONLY; flags |= NBD_FLAG_READ_ONLY;
#endif
#ifdef NBD_CFLAG_DESTROY_ON_DISCONNECT #ifdef NBD_CFLAG_DESTROY_ON_DISCONNECT
if (!cfg["nbd_destroy_on_disconnect"].is_null()) if (!cfg["nbd_destroy_on_disconnect"].is_null())
cflags |= NBD_CFLAG_DESTROY_ON_DISCONNECT; cflags |= NBD_CFLAG_DESTROY_ON_DISCONNECT;
@@ -621,7 +618,10 @@ help:
if (!cfg["dev_num"].is_null()) if (!cfg["dev_num"].is_null())
{ {
int r; int r;
if ((r = run_nbd(sockfd, cfg["dev_num"].int64_value(), device_size, NBD_FLAG_SEND_FLUSH, nbd_timeout, bg)) != 0) uint64_t flags = NBD_FLAG_SEND_FLUSH;
if (!cfg["readonly"].is_null())
flags |= NBD_FLAG_READ_ONLY;
if ((r = run_nbd(sockfd, cfg["dev_num"].int64_value(), device_size, flags, nbd_timeout, bg)) != 0)
{ {
fprintf(stderr, "run_nbd: %s\n", strerror(-r)); fprintf(stderr, "run_nbd: %s\n", strerror(-r));
exit(1); exit(1);