Attachment 14783 Details for Bug 13744 – patch from master for 4.8

[patch] patch from master for 4.8

bz13744_for_4.8.patch (text/plain), 1.28 KB, created by Ralph Wuerthner on 2019-01-17 08:10:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Wuerthner

Created: 2019-01-17 08:10:55 UTC

Size: 1.28 KB

patch

obsolete

>From 296bfc8a1f935860152e89b4700f71c29dd77c01 Mon Sep 17 00:00:00 2001
>From: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
>Date: Tue, 15 Jan 2019 09:55:50 +0100
>Subject: [PATCH] vfs_fileid: fix fsname_norootdir algorithm
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=13744
>
>Signed-off-by: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Thu Jan 17 01:36:54 CET 2019 on sn-devel-144
>
>(cherry picked from commit 2723d900ef35f4797058675f298f4a4364b29cd3)
>---
> source3/modules/vfs_fileid.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
>index cb77a2e..cd6f9c3 100644
>--- a/source3/modules/vfs_fileid.c
>+++ b/source3/modules/vfs_fileid.c
>@@ -456,7 +456,8 @@ static struct file_id fileid_file_id_create(struct vfs_handle_struct *handle,
> 				struct fileid_handle_data,
> 				return id);
> 
>-	if ((data->nolockinode != 0) && (id.inode == data->nolockinode)) {
>+	if ((data->nolockinode != 0) &&
>+	    (sbuf->st_ex_ino == data->nolockinode)) {
> 		devid = fileid_device_mapping_hostname(data, sbuf);
> 	} else {
> 		devid = data->device_mapping_fn(data, sbuf);
>-- 
>2.7.4
>

Flags:

vl: review+

Actions: View

Attachments on bug 13744: 14783 | 14784