summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Wuerthner <ralph.wuerthner@de.ibm.com>2019-01-15 09:55:50 +0100
committerKarolin Seeger <kseeger@samba.org>2019-02-05 15:33:25 +0100
commitb5bc51a75113a79aa5d85605f51e546aa120ecf7 (patch)
tree2d2edfe4723edc3e2e88ec0370dda7f133c1035e
parentc56beb9a1fd18146093b49965938388597425999 (diff)
downloadsamba-b5bc51a75113a79aa5d85605f51e546aa120ecf7.tar.gz
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)
-rw-r--r--source3/modules/vfs_fileid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c
index cb77a2e52c6..cd6f9c30cf3 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);