sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

s3: Remove SHADOW_COPY_DATA typedef

Browse Source
This commit is contained in:
Volker Lendecke 2011-05-30 12:06:31 +02:00
parent 5f6f719564
commit 0ec9a90c29
8 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/include/ntioctl.h
View File

@ -77,13 +77,13 @@
/* For FSCTL_GET_SHADOW_COPY_DATA ...*/
typedef char SHADOW_COPY_LABEL[25];
typedef struct shadow_copy_data {
struct shadow_copy_data {
TALLOC_CTX *mem_ctx;
/* Total number of shadow volumes currently mounted */
uint32 num_volumes;
/* Concatenated list of labels */
SHADOW_COPY_LABEL *labels;
} SHADOW_COPY_DATA;
};
#endif /* _NTIOCTL_H */

5
source3/modules/vfs_default.c
View File

@ -84,7 +84,10 @@ static int vfswrap_set_quota(struct vfs_handle_struct *handle, enum SMB_QUOTA_T
#endif
}
static int vfswrap_get_shadow_copy_data(struct vfs_handle_struct *handle, struct files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
static int vfswrap_get_shadow_copy_data(struct vfs_handle_struct *handle,
struct files_struct *fsp,
struct shadow_copy_data *shadow_copy_data,
bool labels)
{
errno = ENOSYS;
return -1; /* Not implemented. */

3
source3/modules/vfs_full_audit.c
View File

@ -697,7 +697,8 @@ static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
static int smb_full_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
struct files_struct *fsp,
SHADOW_COPY_DATA *shadow_copy_data, bool labels)
struct shadow_copy_data *shadow_copy_data,
bool labels)
{
int result;

5
source3/modules/vfs_shadow_copy.c
View File

@ -216,7 +216,10 @@ static int shadow_copy_closedir(vfs_handle_struct *handle, SMB_STRUCT_DIR *_dirp
return 0;
}
static int shadow_copy_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
static int shadow_copy_get_shadow_copy_data(vfs_handle_struct *handle,
files_struct *fsp,
struct shadow_copy_data *shadow_copy_data,
bool labels)
{
SMB_STRUCT_DIR *p = SMB_VFS_NEXT_OPENDIR(handle,fsp->conn->connectpath,NULL,0);

4
source3/modules/vfs_shadow_copy2.c
View File

@ -837,7 +837,7 @@ static int shadow_copy2_label_cmp_desc(const void *x, const void *y)
sort the shadow copy data in ascending or descending order
*/
static void shadow_copy2_sort_data(vfs_handle_struct *handle,
SHADOW_COPY_DATA *shadow_copy2_data)
struct shadow_copy_data *shadow_copy2_data)
{
int (*cmpfunc)(const void *, const void *);
const char *sort;
@ -869,7 +869,7 @@ static void shadow_copy2_sort_data(vfs_handle_struct *handle,
static int shadow_copy2_get_shadow_copy2_data(vfs_handle_struct *handle,
files_struct *fsp,
SHADOW_COPY_DATA *shadow_copy2_data,
struct shadow_copy_data *shadow_copy2_data,
bool labels)
{
SMB_STRUCT_DIR *p;

2
source3/modules/vfs_time_audit.c
View File

@ -144,7 +144,7 @@ static int smb_time_audit_set_quota(struct vfs_handle_struct *handle,
static int smb_time_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
struct files_struct *fsp,
SHADOW_COPY_DATA *shadow_copy_data,
struct shadow_copy_data *shadow_copy_data,
bool labels)
{
int result;

5
source3/smbd/nttrans.c
View File

@ -2214,7 +2214,7 @@ static void call_nt_transact_ioctl(connection_struct *conn,
* Allocate the correct amount and return the pointer to let
* it be deallocated when we return.
*/
SHADOW_COPY_DATA *shadow_data = NULL;
struct shadow_copy_data *shadow_data = NULL;
TALLOC_CTX *shadow_mem_ctx = NULL;
bool labels = False;
uint32 labels_data_count = 0;
@ -2243,7 +2243,8 @@ static void call_nt_transact_ioctl(connection_struct *conn,
return;
}
shadow_data = TALLOC_ZERO_P(shadow_mem_ctx,SHADOW_COPY_DATA);
shadow_data = TALLOC_ZERO_P(shadow_mem_ctx,
struct shadow_copy_data);
if (shadow_data == NULL) {
DEBUG(0,("TALLOC_ZERO() failed!\n"));
talloc_destroy(shadow_mem_ctx);

2
source3/smbd/vfs.c
View File

@ -1174,7 +1174,7 @@ int smb_vfs_call_set_quota(struct vfs_handle_struct *handle,
int smb_vfs_call_get_shadow_copy_data(struct vfs_handle_struct *handle,
struct files_struct *fsp,
SHADOW_COPY_DATA *shadow_copy_data,
struct shadow_copy_data *shadow_copy_data,
bool labels)
{
VFS_FIND(get_shadow_copy_data);