diff options
| -rw-r--r-- | source3/include/includes.h | 8 | ||||
| -rw-r--r-- | source3/librpc/idl/open_files.idl | 1 | ||||
| -rw-r--r-- | source3/smbd/durable.c | 14 |
3 files changed, 0 insertions, 23 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index de44fd2d99..0715608c32 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -322,14 +322,6 @@ struct stat_ex { uint32_t st_ex_flags; uint32_t st_ex_mask; - - /* - * Add space for VFS internal extensions. The initial user of this - * would be the onefs modules, passing the snapid from the stat calls - * to the file_id_create call. Maybe we'll have to expand this later, - * but the core of Samba should never look at this field. - */ - uint64_t vfs_private; }; typedef struct stat_ex SMB_STRUCT_STAT; diff --git a/source3/librpc/idl/open_files.idl b/source3/librpc/idl/open_files.idl index 0ebc819d19..42783018e2 100644 --- a/source3/librpc/idl/open_files.idl +++ b/source3/librpc/idl/open_files.idl @@ -76,7 +76,6 @@ interface open_files hyper st_ex_blocks; uint32 st_ex_flags; uint32 st_ex_mask; - hyper vfs_private; } vfs_default_durable_stat; typedef [public] struct { diff --git a/source3/smbd/durable.c b/source3/smbd/durable.c index 0da734e0e0..9489cf15d1 100644 --- a/source3/smbd/durable.c +++ b/source3/smbd/durable.c @@ -121,7 +121,6 @@ NTSTATUS vfs_default_durable_cookie(struct files_struct *fsp, 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; - cookie.stat_info.vfs_private = fsp->fsp_name->st.vfs_private; ndr_err = ndr_push_struct_blob(cookie_blob, mem_ctx, &cookie, (ndr_push_flags_fn_t)ndr_push_vfs_default_durable_cookie); @@ -275,7 +274,6 @@ NTSTATUS vfs_default_durable_disconnect(struct files_struct *fsp, 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; - cookie.stat_info.vfs_private = fsp->fsp_name->st.vfs_private; ndr_err = ndr_push_struct_blob(&new_cookie_blob, mem_ctx, &cookie, (ndr_push_flags_fn_t)ndr_push_vfs_default_durable_cookie); @@ -536,18 +534,6 @@ static bool vfs_default_durable_reconnect_check_stat( return false; } - if (cookie_st->vfs_private != fsp_st->vfs_private) { - DEBUG(1, ("vfs_default_durable_reconnect (%s): " - "stat_ex.%s differs: " - "cookie:%llu != stat:%llu, " - "denying durable reconnect\n", - name, - "vfs_private", - (unsigned long long)cookie_st->vfs_private, - (unsigned long long)fsp_st->vfs_private)); - return false; - } - return true; } |