sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

smbd: Move dfree_info struct

Browse Source 
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>
This commit is contained in:
Christof Schmitt 2018-05-16 13:25:54 -07:00 committed by Jeremy Allison
parent e30d0c0e0d
commit 9a79a61abb
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/include/vfs.h
View File

@ -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;

8
source3/smbd/dfree.c
View File

@ -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)
{