Attachment 13409 Details for Bug 12911 – git-am fix for 4.7.0

[patch] git-am fix for 4.7.0

0001-vfs_ceph-fix-cephwrap_chdir.patch (text/plain), 1.47 KB, created by Jeremy Allison on 2017-07-21 23:19:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2017-07-21 23:19:51 UTC

Size: 1.47 KB

patch

obsolete

>From e84f7ca3d2a0266cd3daa96dfde2acb12151c54f Mon Sep 17 00:00:00 2001
>From: David Disseldorp <ddiss@samba.org>
>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 <ddiss@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): David Disseldorp <ddiss@samba.org>
>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 | 8 --------
> 1 file changed, 8 deletions(-)
>
>diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
>index 73106c4ac60..9abd32196a8 100644
>--- a/source3/modules/vfs_ceph.c
>+++ b/source3/modules/vfs_ceph.c
>@@ -936,14 +936,6 @@ static int cephwrap_chdir(struct vfs_handle_struct *handle,
> {
> 	int result = -1;
> 	DBG_DEBUG("[CEPH] chdir(%p, %s)\n", handle, smb_fname->base_name);
>-	/*
>-	 * If the path is just / use chdir because Ceph is below / and
>-	 * cannot deal with changing directory above its mount point
>-	 */
>-	if (!strcmp(smb_fname->base_name, "/")) {
>-		return chdir(smb_fname->base_name);
>-	}
>-
> 	result = ceph_chdir(handle->data, smb_fname->base_name);
> 	DBG_DEBUG("[CEPH] chdir(...) = %d\n", result);
> 	WRAP_RETURN(result);
>-- 
>2.14.0.rc0.284.gd933b75aa4-goog
>

Flags:

ddiss: review+

Actions: View

Attachments on bug 12911: 13390 | 13409 | 13422 | 13423