Attachment 15695 Details for Bug 14182 – patch from master for v4.10 and v4.11

[patch] patch from master for v4.10 and v4.11

patch (text/plain), 1.78 KB, created by Guenther Deschner on 2019-12-17 22:01:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2019-12-17 22:01:48 UTC

Size: 1.78 KB

patch

obsolete

>From f239aff19abebc64cf3e5d3a9580af2c4ed5d85e Mon Sep 17 00:00:00 2001
>From: Anoop C S <anoopcs@redhat.com>
>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 <anoopcs@redhat.com>
>Reviewed-by: GÃ¼nther Deschner <gd@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>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
>

Flags:

jra: review+
gd: ci-passed+

Actions: View

Attachments on bug 14182: 15616 | 15695