s3: remove unused st_ex_mask from struct stat_ex

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

diff --git a/source3/include/includes.h b/source3/include/includes.h
index c26b75f579184b8836ce56337ebff2cdef44833e..8f398d0d24bfdb08c625752bcb57c3be4a323d9b 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -213,7 +213,6 @@ struct stat_ex {
        blkcnt_t        st_ex_blocks;
 
        uint32_t        st_ex_flags;
-       uint32_t        st_ex_mask;
 };
 
 typedef struct stat_ex SMB_STRUCT_STAT;

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 67cbe758674365c3f3960cfa037be87787651c30..39ea04bf266cf00a8d58b9a074e706f6aed04d78 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -261,6 +261,7 @@
 /* Version 40 - Add SMB_VFS_GET_DOS_ATTRIBUTES_SEND/RECV */
 /* Bump to version 41, Samba 4.11 will ship with that */
 /* Version 41 - Remove SMB_VFS_BRL_CANCEL_WINDOWS */
+/* Version 41 - Remove unused st_ex_mask from struct stat_ex */
 
 #define SMB_VFS_INTERFACE_VERSION 41
 

diff --git a/source3/librpc/idl/open_files.idl b/source3/librpc/idl/open_files.idl
index d724d73821461f524a7fabcd285767f8a9440e5a..5668a0b97e247560ed0186ea3abe56524be9a73d 100644 (file)
--- a/source3/librpc/idl/open_files.idl
+++ b/source3/librpc/idl/open_files.idl
@@ -80,7 +80,6 @@ interface open_files
                hyper           st_ex_blksize;
                hyper           st_ex_blocks;
                uint32          st_ex_flags;
-               uint32          st_ex_mask;
        } vfs_default_durable_stat;
 
        typedef [public] struct {

diff --git a/source3/smbd/durable.c b/source3/smbd/durable.c
index 0c4a2fec684aac1e4d3f95a9fb53257245d2a715..311f7e598a47b80367142307cdb599a4082826a8 100644 (file)
--- a/source3/smbd/durable.c
+++ b/source3/smbd/durable.c
@@ -122,7 +122,6 @@ NTSTATUS vfs_default_durable_cookie(struct files_struct *fsp,
        cookie.stat_info.st_ex_blksize = fsp->fsp_name->st.st_ex_blksize;
        cookie.stat_info.st_ex_blocks = fsp->fsp_name->st.st_ex_blocks;
        cookie.stat_info.st_ex_flags = fsp->fsp_name->st.st_ex_flags;
-       cookie.stat_info.st_ex_mask = fsp->fsp_name->st.st_ex_mask;
 
        ndr_err = ndr_push_struct_blob(cookie_blob, mem_ctx, &cookie,
                        (ndr_push_flags_fn_t)ndr_push_vfs_default_durable_cookie);
@@ -272,7 +271,6 @@ NTSTATUS vfs_default_durable_disconnect(struct files_struct *fsp,
        cookie.stat_info.st_ex_blksize = fsp->fsp_name->st.st_ex_blksize;
        cookie.stat_info.st_ex_blocks = fsp->fsp_name->st.st_ex_blocks;
        cookie.stat_info.st_ex_flags = fsp->fsp_name->st.st_ex_flags;
-       cookie.stat_info.st_ex_mask = fsp->fsp_name->st.st_ex_mask;
 
        ndr_err = ndr_push_struct_blob(&new_cookie_blob, mem_ctx, &cookie,
                        (ndr_push_flags_fn_t)ndr_push_vfs_default_durable_cookie);
@@ -497,18 +495,6 @@ static bool vfs_default_durable_reconnect_check_stat(
                return false;
        }
 
-       if (cookie_st->st_ex_mask != fsp_st->st_ex_mask) {
-               DEBUG(1, ("vfs_default_durable_reconnect (%s): "
-                         "stat_ex.%s differs: "
-                         "cookie:%llu != stat:%llu, "
-                         "denying durable reconnect\n",
-                         name,
-                         "st_ex_mask",
-                         (unsigned long long)cookie_st->st_ex_mask,
-                         (unsigned long long)fsp_st->st_ex_mask));
-               return false;
-       }
-
        return true;
 }