From 19db619daeccb452e2638cd768dd5e54632b1f25 Mon Sep 17 00:00:00 2001 From: Ralph Wuerthner 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 Reviewed-by: Volker Lendecke Reviewed-by: Ralph Boehme Autobuild-User(master): Volker Lendecke 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