From: Ralph Boehme <slow@samba.org>
Date: Thu, 27 Jun 2019 12:46:37 +0000 (+0200)
Subject: s3:smbd: use stored file_id in SMB_VFS_FS_FILE_ID()
X-Git-Tag: ldb-2.0.5~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3caf4140c01136a412c129cae28b433e33ab014;p=thirdparty%2Fsamba.git

s3:smbd: use stored file_id in SMB_VFS_FS_FILE_ID()

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index dcb53c64eef..bcad1c8a736 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2737,6 +2737,10 @@ static uint64_t vfswrap_fs_file_id(struct vfs_handle_struct *handle,
 		return 0;
 	}
 
+	if (!(psbuf->st_ex_iflags & ST_EX_IFLAG_CALCULATED_ITIME)) {
+		return psbuf->st_ex_file_id;
+	}
+
 	if (handle->conn->base_share_dev == psbuf->st_ex_dev) {
 		return (uint64_t)psbuf->st_ex_ino;
 	}