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)

diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index cb77a2e52c627e0803c8e837f6ab8c98c76fc77b..cd6f9c30cf335d0fd8bc375d565444ad46827ad5 100644 (file)
--- 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);