diff options
| author | David Disseldorp <ddiss@samba.org> | 2015-02-16 19:26:24 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-02-17 05:37:20 +0100 |
| commit | 41c4666a726d3fbe234bcb8b38bd24c62799598f (patch) | |
| tree | e1592fcc63cdef1a9feb0b29e2ebb2dda15120e5 /source3/include | |
| parent | 4ab0e57f1073e776b8832f5edc3dca04ef903fef (diff) | |
s3/vfs: remove unused SMB_VFS_DISK_FREE() small_query parameter
The small_query parameter for SMB_VFS_DISK_FREE() was, prior to the
previous commit, used to obtain 16-bit wide free-space information for
the deprecated dskattr SMB_COM_QUERY_INFORMATION_DISK command.
With the dskattr handler now performing the 16-bit collapse directly,
the small_query parameter can be removed from the entire code path.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Feb 17 05:37:20 CET 2015 on sn-devel-104
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 10 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 1843ef428e..3444f62168 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -160,7 +160,8 @@ /* Version 32 - Add "lease" to CREATE_FILE operation */ /* Version 32 - Add "lease" to struct files_struct */ /* Version 32 - Add SMB_VFS_READDIR_ATTR() */ -/* Version 32 - Add in and our create context blobs to create_file */ +/* Version 32 - Add in and out create context blobs to create_file */ +/* Version 32 - Remove unnecessary SMB_VFS_DISK_FREE() small_query parameter */ #define SMB_VFS_INTERFACE_VERSION 32 @@ -503,7 +504,7 @@ struct vfs_fn_pointers { int (*connect_fn)(struct vfs_handle_struct *handle, const char *service, const char *user); void (*disconnect_fn)(struct vfs_handle_struct *handle); - uint64_t (*disk_free_fn)(struct vfs_handle_struct *handle, const char *path, bool small_query, uint64_t *bsize, + uint64_t (*disk_free_fn)(struct vfs_handle_struct *handle, const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize); int (*get_quota_fn)(struct vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *qt); int (*set_quota_fn)(struct vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *qt); @@ -903,9 +904,8 @@ int smb_vfs_call_connect(struct vfs_handle_struct *handle, const char *service, const char *user); void smb_vfs_call_disconnect(struct vfs_handle_struct *handle); uint64_t smb_vfs_call_disk_free(struct vfs_handle_struct *handle, - const char *path, bool small_query, - uint64_t *bsize, uint64_t *dfree, - uint64_t *dsize); + const char *path, uint64_t *bsize, + uint64_t *dfree, uint64_t *dsize); int smb_vfs_call_get_quota(struct vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *qt); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index ef97b49e7e..0cc442e010 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -39,10 +39,10 @@ #define SMB_VFS_NEXT_DISCONNECT(handle) \ smb_vfs_call_disconnect((handle)->next) -#define SMB_VFS_DISK_FREE(conn, path, small_query, bsize, dfree ,dsize) \ - smb_vfs_call_disk_free((conn)->vfs_handles, (path), (small_query), (bsize), (dfree), (dsize)) -#define SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, bsize, dfree ,dsize)\ - smb_vfs_call_disk_free((handle)->next, (path), (small_query), (bsize), (dfree), (dsize)) +#define SMB_VFS_DISK_FREE(conn, path, bsize, dfree ,dsize) \ + smb_vfs_call_disk_free((conn)->vfs_handles, (path), (bsize), (dfree), (dsize)) +#define SMB_VFS_NEXT_DISK_FREE(handle, path, bsize, dfree ,dsize)\ + smb_vfs_call_disk_free((handle)->next, (path), (bsize), (dfree), (dsize)) #define SMB_VFS_GET_QUOTA(conn, qtype, id, qt) \ smb_vfs_call_get_quota((conn)->vfs_handles, (qtype), (id), (qt)) |