From 4a29a949ac45fab55b8c41dcbe11a5e07fd62c05 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Tue, 22 May 2018 12:22:06 -0700 Subject: [PATCH] vfs_gpfs: Remove wrong get_full_smb_filename from ntimes function Updating the timestamps requires the path to the file, but no stream information. Signed-off-by: Christof Schmitt Reviewed-by: Jeremy Allison --- source3/modules/vfs_gpfs.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 965dfac92a0..19c61931732 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -1888,23 +1888,15 @@ static int vfs_gpfs_ntimes(struct vfs_handle_struct *handle, struct gpfs_winattr attrs; int ret; - char *path = NULL; - NTSTATUS status; struct gpfs_config_data *config; SMB_VFS_HANDLE_GET_DATA(handle, config, struct gpfs_config_data, return -1); - status = get_full_smb_filename(talloc_tos(), smb_fname, &path); - if (!NT_STATUS_IS_OK(status)) { - errno = map_errno_from_nt_status(status); - return -1; - } - /* Try to use gpfs_set_times if it is enabled and available */ if (config->settimes) { - ret = smbd_gpfs_set_times_path(path, ft); + ret = smbd_gpfs_set_times_path(smb_fname->base_name, ft); if (ret == 0 || (ret == -1 && errno != ENOSYS)) { return ret; @@ -1937,7 +1929,7 @@ static int vfs_gpfs_ntimes(struct vfs_handle_struct *handle, attrs.creationTime.tv_sec = ft->create_time.tv_sec; attrs.creationTime.tv_nsec = ft->create_time.tv_nsec; - ret = gpfswrap_set_winattrs_path(discard_const_p(char, path), + ret = gpfswrap_set_winattrs_path(smb_fname->base_name, GPFS_WINATTR_SET_CREATION_TIME, &attrs); if(ret == -1 && errno != ENOSYS){ -- 2.47.2