From fac3c911d5ddaf8e4a9c571b1c8beadef0b83704 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 14 Jul 2017 23:55:29 +0200 Subject: [PATCH] vfs_ceph: fix cephwrap_chdir() When provided a '/' path (i.e. CephFS root), vfs_ceph does a *local* chdir() to the share path. This breaks smb client directory listings. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12911 Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison Autobuild-User(master): David Disseldorp Autobuild-Date(master): Fri Jul 21 19:10:46 CEST 2017 on sn-devel-144 (cherry picked from commit 1dcacff083019810e207a3d123a81fe32d9dde1a) --- source3/modules/vfs_ceph.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index 75233ef677f..e3d22bfce29 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -916,13 +916,6 @@ static int cephwrap_chdir(struct vfs_handle_struct *handle, const char *path) { int result = -1; DBG_DEBUG("[CEPH] chdir(%p, %s)\n", handle, path); - /* - * If the path is just / use chdir because Ceph is below / and - * cannot deal with changing directory above its mount point - */ - if (path && !strcmp(path, "/")) - return chdir(path); - result = ceph_chdir(handle->data, path); DBG_DEBUG("[CEPH] chdir(...) = %d\n", result); WRAP_RETURN(result); -- 2.12.3