smbd: Move dfree_info struct

As the struct is no longer used as part of connection_struct, move it to
dfree.c.

This is not backported, as it would change the VFS ABI.

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 945e4b6b8b0661b30708d4da02519c5495f9d00a..81fb6c1f14537d032fd9e52e17dbb5809c7996d9 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -253,6 +253,8 @@
                All users are now pwrite or async versions. */
 /* Version 39 - Remove SMB_VFS_CHMOD_ACL - no longer used. */
 /* Version 39 - Remove SMB_VFS_FCHMOD_ACL - no longer used. */
+/* Version 39 - Remove struct dfree_cached_info pointer from
+               connection struct */
 
 #define SMB_VFS_INTERFACE_VERSION 39
 
@@ -411,14 +413,6 @@ typedef struct {
        bool is_wild;
 } name_compare_entry;
 
-struct dfree_cached_info {
-       time_t last_dfree_time;
-       uint64_t dfree_ret;
-       uint64_t bsize;
-       uint64_t dfree;
-       uint64_t dsize;
-};
-
 struct share_params {
        int service;
 };
@@ -481,7 +475,6 @@ typedef struct connection_struct {
        name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */
        name_compare_entry *veto_oplock_list; /* Per-share list of files to refuse oplocks on. */       
        name_compare_entry *aio_write_behind_list; /* Per-share list of files to use aio write behind on. */       
-       struct dfree_cached_info *dfree_info;
        struct trans_state *pending_trans;
 
        struct rpc_pipe_client *spoolss_pipe;

diff --git a/source3/smbd/dfree.c b/source3/smbd/dfree.c
index d280e1efe7f8c44391ac1a393414b779545a9550..05f6d6988c1cee8567fc18987b6d1756eeeeface 100644 (file)
--- a/source3/smbd/dfree.c
+++ b/source3/smbd/dfree.c
@@ -175,6 +175,14 @@ dfree_done:
  key to accomodate this.
 ****************************************************************************/
 
+struct dfree_cached_info {
+       time_t last_dfree_time;
+       uint64_t dfree_ret;
+       uint64_t bsize;
+       uint64_t dfree;
+       uint64_t dsize;
+};
+
 uint64_t get_dfree_info(connection_struct *conn, struct smb_filename *fname,
                        uint64_t *bsize, uint64_t *dfree, uint64_t *dsize)
 {