From: Anoop C S Date: Tue, 17 Sep 2024 18:28:50 +0000 (+0530) Subject: vfs_glusterfs: Retrieve fs capabilities using vfs_get_fs_capabilities X-Git-Tag: samba-4.21.5~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f57377d1b9c05d79d8c18d0cd1ce1ba03cde6bd0;p=thirdparty%2Fsamba.git vfs_glusterfs: Retrieve fs capabilities using vfs_get_fs_capabilities vfs_glusterfs is supposed to be the last entry when listed with other vfs modules. This is due to the fact that the connection path is not local to the server but relative to the virtual remote file system beneath it. Especially SMB_VFS_FS_CAPABILITIES implementation from vfs_default is likely to return incorrect results based on the connection path assumed to be local to the server which might not be the case with glusterfs module stacked. Therefore it doesn't make sense to pass through any vfs interface implementations further down the line to vfs_default. Instead make use of get_fs_capabilties to start with already known fs capabilties from connect phase. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15822 Signed-off-by: Anoop C S Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Mon Oct 7 13:36:11 UTC 2024 on atb-devel-224 (cherry picked from commit 3c6ca81aad16e74bc3d9c4784baf97a237f652c6) --- diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index 5729766a8d7..433c133a720 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -594,18 +594,12 @@ static int vfs_gluster_statvfs(struct vfs_handle_struct *handle, static uint32_t vfs_gluster_fs_capabilities(struct vfs_handle_struct *handle, enum timestamp_set_resolution *p_ts_res) { - uint32_t caps; - - caps = SMB_VFS_NEXT_FS_CAPABILITIES(handle, p_ts_res); + uint32_t caps = vfs_get_fs_capabilities(handle->conn, p_ts_res); #ifdef HAVE_GFAPI_VER_6 caps |= FILE_SUPPORTS_SPARSE_FILES; #endif -#ifdef STAT_HAVE_NSEC - *p_ts_res = TIMESTAMP_SET_NT_OR_BETTER; -#endif - return caps; }