The branch, v4-22-test has been updated
via 5c357796ab4 vfs_ceph_new: Use integer value instead of boolean
via 23d2e88c641 vfs_ceph_new: dont use ceph_ll_nonblocking_readv_writev
for fsync_send
from 6ee4a2bfcbd s3:net: Pass down the server from cmdline to
sync_pw2keytabs()
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-22-test
- Log -----------------------------------------------------------------
commit 5c357796ab422166731d6d7ed2d0b8a25bca42b1
Author: Anoop C S <[email protected]>
Date: Mon Sep 22 11:11:46 2025 +0530
vfs_ceph_new: Use integer value instead of boolean
ceph_ll_fsync() API[1] accepts the third and final argument as integer
and not a boolean value.
[1]
https://github.com/ceph/ceph/blob/main/src/include/cephfs/libcephfs.h#L2041
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15919
Signed-off-by: Anoop C S <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Mon Sep 22 12:24:35 UTC 2025 on atb-devel-224
(cherry picked from commit 5200c120f34c4a28fa9f4cb55b46dbb9d90eb758)
Autobuild-User(v4-22-test): Jule Anger <[email protected]>
Autobuild-Date(v4-22-test): Thu Sep 25 13:24:44 UTC 2025 on atb-devel-224
commit 23d2e88c641841dcd4f511083b7499a3c3a104b5
Author: Shachar Sharon <[email protected]>
Date: Wed Sep 17 14:25:27 2025 +0300
vfs_ceph_new: dont use ceph_ll_nonblocking_readv_writev for fsync_send
Commit 4ae922413844 ("vfs_ceph_new: use libcephfs nonblocking API for
async-io ops") uses ceph_ll_nonblocking_readv_writev for fsync_send.
However, the actual behaviour of libcephfs when using this API with
'fsync=true' is not async-fsync, as one may assume. Instead,
vfs_ceph_new should use a nonblocking fsync API[1], once it is ready.
Removed the usage of ceph_ll_nonblocking_readv_writev for fsync.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=15919
[1]
https://github.com/ceph/ceph/commit/c88a21c30d8b265adb152f631d2629d29539f7b7
Signed-off-by: Shachar Sharon <[email protected]>
Reviewed-by: Anoop C S <[email protected]>
Reviewed-by: Xavi Hernandez <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
(cherry picked from commit 82c0988a8bc3d3e364e2d56ad8ea27e359fbc3f0)
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_ceph_new.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_ceph_new.c b/source3/modules/vfs_ceph_new.c
index b97279982cd..45dbeed33be 100644
--- a/source3/modules/vfs_ceph_new.c
+++ b/source3/modules/vfs_ceph_new.c
@@ -2972,18 +2972,8 @@ static struct tevent_req *vfs_ceph_fsync_send(struct
vfs_handle_struct *handle,
0);
SMBPROFILE_BYTES_ASYNC_SET_IDLE(state->profile_bytes);
-#if HAVE_CEPH_ASYNCIO
- state->req = req;
- state->data = NULL;
- state->len = 0;
- state->off = 0;
- state->fsync = true;
- vfs_ceph_aio_submit(handle, req, ev);
- return req;
-#endif
-
vfs_ceph_aio_start(state);
- ret = vfs_ceph_ll_fsync(handle, state->cfh, false);
+ ret = vfs_ceph_ll_fsync(handle, state->cfh, 0);
vfs_ceph_aio_finish(state, ret);
if (ret != 0) {
/* ceph_fsync returns -errno on error. */
--
Samba Shared Repository
