[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  3ee78cc9979 vfs_glusterfs: initialize st_ex_file_id, st_ex_itime and st_ex_iflags
       via  442a7c9ad8b vfs_default: use correct flag in vfswrap_fs_file_id
      from  ec05edcceed smbd: Make sys_disk_free static

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3ee78cc9979a72ebbe65a16c60967a1735a0d208
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Aug 14 10:11:15 2019 +0200

    vfs_glusterfs: initialize st_ex_file_id, st_ex_itime and st_ex_iflags
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14090
    RN: vfs_glusterfs: initialize st_ex_file_id, st_ex_itime and st_ex_iflags
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Aug 16 01:07:23 UTC 2019 on sn-devel-184

commit 442a7c9ad8b020b2e88e41fea8a911d244023cb9
Author: Ralph Boehme <slow at samba.org>
Date:   Wed Aug 14 10:06:00 2019 +0200

    vfs_default: use correct flag in vfswrap_fs_file_id
    
    Luckily using the wrong flag ST_EX_IFLAG_CALCULATED_ITIME currently results in
    the same semantics as using the correct ST_EX_IFLAG_CALCULATED_FILE_ID, as in
    vfs_default the non-calculated file_id is based a non-calculated itime.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14089
    RN: vfs_default: use correct flag in vfswrap_fs_file_id
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_default.c   | 2 +-
 source3/modules/vfs_glusterfs.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 6580a05bbd6..213c6ddd9cd 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2733,7 +2733,7 @@ static uint64_t vfswrap_fs_file_id(struct vfs_handle_struct *handle,
 {
 	uint64_t file_id;
 
-	if (!(psbuf->st_ex_iflags & ST_EX_IFLAG_CALCULATED_ITIME)) {
+	if (!(psbuf->st_ex_iflags & ST_EX_IFLAG_CALCULATED_FILE_ID)) {
 		return psbuf->st_ex_file_id;
 	}
 
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index 3aa66c270e1..1374da97a79 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -74,12 +74,16 @@ static void smb_stat_ex_from_stat(struct stat_ex *dst, const struct stat *src)
 	dst->st_ex_btime.tv_sec = src->st_mtime;
 	dst->st_ex_blksize = src->st_blksize;
 	dst->st_ex_blocks = src->st_blocks;
+	dst->st_ex_file_id = dst->st_ex_ino;
+	dst->st_ex_iflags |= ST_EX_IFLAG_CALCULATED_FILE_ID;
 #ifdef STAT_HAVE_NSEC
 	dst->st_ex_atime.tv_nsec = src->st_atime_nsec;
 	dst->st_ex_mtime.tv_nsec = src->st_mtime_nsec;
 	dst->st_ex_ctime.tv_nsec = src->st_ctime_nsec;
 	dst->st_ex_btime.tv_nsec = src->st_mtime_nsec;
 #endif
+	dst->st_ex_itime = dst->st_ex_btime;
+	dst->st_ex_iflags |= ST_EX_IFLAG_CALCULATED_ITIME;
 }
 
 /* pre-opened glfs_t */


-- 
Samba Shared Repository