diff options
| author | Jeremy Allison <jra@samba.org> | 2017-05-19 16:15:55 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-06-18 02:49:24 +0200 |
| commit | 730de8e091879a53493a0c96b542603cd52174a2 (patch) | |
| tree | b5f84772da7675c5bc86d37d9dd3bc53796e078f /source3/include | |
| parent | c3d45216dd7df2a084b7d1af63f207db0c87b53d (diff) | |
| download | samba-730de8e091879a53493a0c96b542603cd52174a2.tar.gz | |
s3: VFS: Change SMB_VFS_CHFLAGS to use const struct smb_filename * instead of const char *.
We need to migrate all pathname based VFS calls to use a struct
to finish modernising the VFS with extra timestamp and flags parameters.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 11 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index ec7f0d0a731..93ec6e8f49a 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -214,6 +214,8 @@ /* Version 37 - Change getxattr from const char * to const struct smb_filename * */ /* Version 37 - Change mknod from const char * to const struct smb_filename * */ +/* Version 37 - Change chflags from const char * + to const struct smb_filename * */ #define SMB_VFS_INTERFACE_VERSION 37 @@ -734,7 +736,9 @@ struct vfs_fn_pointers { mode_t mode, SMB_DEV_T dev); char *(*realpath_fn)(struct vfs_handle_struct *handle, const char *path); - int (*chflags_fn)(struct vfs_handle_struct *handle, const char *path, unsigned int flags); + int (*chflags_fn)(struct vfs_handle_struct *handle, + const struct smb_filename *smb_fname, + unsigned int flags); struct file_id (*file_id_create_fn)(struct vfs_handle_struct *handle, const SMB_STRUCT_STAT *sbuf); struct tevent_req *(*copy_chunk_send_fn)(struct vfs_handle_struct *handle, @@ -1231,8 +1235,9 @@ int smb_vfs_call_mknod(struct vfs_handle_struct *handle, mode_t mode, SMB_DEV_T dev); char *smb_vfs_call_realpath(struct vfs_handle_struct *handle, const char *path); -int smb_vfs_call_chflags(struct vfs_handle_struct *handle, const char *path, - unsigned int flags); +int smb_vfs_call_chflags(struct vfs_handle_struct *handle, + const struct smb_filename *smb_fname, + unsigned int flags); struct file_id smb_vfs_call_file_id_create(struct vfs_handle_struct *handle, const SMB_STRUCT_STAT *sbuf); NTSTATUS smb_vfs_call_streaminfo(struct vfs_handle_struct *handle, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 30271a6fc3a..701dc534984 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -336,10 +336,10 @@ #define SMB_VFS_NEXT_REALPATH(handle, path) \ smb_vfs_call_realpath((handle)->next, (path)) -#define SMB_VFS_CHFLAGS(conn, path, flags) \ - smb_vfs_call_chflags((conn)->vfs_handles, (path), (flags)) -#define SMB_VFS_NEXT_CHFLAGS(handle, path, flags) \ - smb_vfs_call_chflags((handle)->next, (path), (flags)) +#define SMB_VFS_CHFLAGS(conn, smb_fname, flags) \ + smb_vfs_call_chflags((conn)->vfs_handles, (smb_fname), (flags)) +#define SMB_VFS_NEXT_CHFLAGS(handle, smb_fname, flags) \ + smb_vfs_call_chflags((handle)->next, (smb_fname), (flags)) #define SMB_VFS_FILE_ID_CREATE(conn, sbuf) \ smb_vfs_call_file_id_create((conn)->vfs_handles, (sbuf)) |