From f239aff19abebc64cf3e5d3a9580af2c4ed5d85e Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Tue, 12 Nov 2019 19:58:43 +0530 Subject: [PATCH] s3: VFS: glusterfs: Reset nlinks for symlink entries during readdir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On receiving an already initialized stat_ex buffer for readdir() call we invoke readdirplus() GlusterFS API, an optimized variant of readdir(), which then returns stat information along with dir entry result. But for symlink entries we don't know if link or target info is needed. In that case it is better to leave this decision back to caller by resetting nlinks value inside stat information to make it invalid. This was also preventing us from displaying msdfs link as directories inside the share. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14182 Signed-off-by: Anoop C S Reviewed-by: Günther Deschner Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Dec 17 21:53:07 UTC 2019 on sn-devel-184 (cherry picked from commit fca2d3e0d1fa5af59e7b729f7c1d126f7b81e149) --- source3/modules/vfs_glusterfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index 8827bf018ab..f23a8821add 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -564,7 +564,10 @@ static struct dirent *vfs_gluster_readdir(struct vfs_handle_struct *handle, } if (sbuf != NULL) { - smb_stat_ex_from_stat(sbuf, &stat); + SET_STAT_INVALID(*sbuf); + if (!S_ISLNK(stat.st_mode)) { + smb_stat_ex_from_stat(sbuf, &stat); + } } END_PROFILE(syscall_readdir); -- 2.23.0