diff options
| author | Michael Adam <obnox@samba.org> | 2014-07-17 17:27:17 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-08-07 16:43:09 +0200 |
| commit | cef315660025fc97ef39a030a0d7314d480e7a4e (patch) | |
| tree | a83c5c249067407e1a12a23f5d9e51070d20c035 | |
| parent | 4791d5cc710f114cb71fe269b85e37ae04d55e09 (diff) | |
| download | samba-cef315660025fc97ef39a030a0d7314d480e7a4e.tar.gz | |
s3: remove stat_ex.vfs_private completely
It is not used any more.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Thu Jul 24 14:23:11 CEST 2014 on sn-devel-104
(cherry picked from commit cd95937369b1729e2417d78f3c903bce5d32da93)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10741
| -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 1b22a5770c..e8434f2b2e 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 686bc02548..42ecb02210 100644 --- a/source3/librpc/idl/open_files.idl +++ b/source3/librpc/idl/open_files.idl @@ -77,7 +77,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 9b05d48680..c3d0a6fd58 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; } |