sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

vfs_fruit: convert ad_open_rsrc() to open a proper fsp with SMB_VFS_CREATE_FILE()

Browse Source 
A first step in converting all raw syscalls to use proper VFS functions. All
existing users of the raw system filedescriptor continue to use the fd from
fsp->fh for now.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2019-05-23 16:42:52 +02:00 committed by Jeremy Allison
parent f5f7d1e9bf
commit 29418c726b
1 changed files with 78 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
source3/modules/vfs_fruit.c
View File

@ -413,7 +413,7 @@ struct ad_entry {
};
struct adouble {
int ad_fd;
files_struct *ad_fsp;
bool ad_opened;
adouble_type_t ad_type;
uint32_t ad_magic;
@ -1013,7 +1013,7 @@ static bool ad_convert_move_reso(vfs_handle_struct *handle,
/* FIXME: direct use of mmap(), vfs_aio_fork does it too */
map = mmap(NULL, maplen, PROT_READ|PROT_WRITE, MAP_SHARED,
ad->ad_fd, 0);
ad->ad_fsp->fh->fd, 0);
if (map == MAP_FAILED) {
DBG_ERR("mmap AppleDouble: %s\n", strerror(errno));
return false;
@ -1038,7 +1038,7 @@ static bool ad_convert_move_reso(vfs_handle_struct *handle,
return false;
}
len = sys_pwrite(ad->ad_fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
len = sys_pwrite(ad->ad_fsp->fh->fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
if (len != AD_DATASZ_DOT_UND) {
DBG_ERR("%s: bad size: %zd\n", smb_fname->base_name, len);
return false;
@ -1085,7 +1085,7 @@ static bool ad_convert_xattr(vfs_handle_struct *handle,
/* FIXME: direct use of mmap(), vfs_aio_fork does it too */
map = mmap(NULL, maplen, PROT_READ|PROT_WRITE, MAP_SHARED,
ad->ad_fd, 0);
ad->ad_fsp->fh->fd, 0);
if (map == MAP_FAILED) {
DBG_ERR("mmap AppleDouble: %s\n", strerror(errno));
return false;
@ -1190,7 +1190,7 @@ static bool ad_convert_xattr(vfs_handle_struct *handle,
goto fail;
}
len = sys_pwrite(ad->ad_fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
len = sys_pwrite(ad->ad_fsp->fh->fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
if (len != AD_DATASZ_DOT_UND) {
DBG_ERR("%s: bad size: %zd\n", smb_fname->base_name, len);
ok = false;
@ -1327,7 +1327,7 @@ static bool ad_convert_truncate(struct adouble *ad,
* FIXME: direct ftruncate(), but we don't have a fsp for the
* VFS call
*/
rc = ftruncate(ad->ad_fd, ADEDOFF_RFORK_DOT_UND +
rc = ftruncate(ad->ad_fsp->fh->fd, ADEDOFF_RFORK_DOT_UND +
ad_getentrylen(ad, ADEID_RFORK));
if (rc != 0) {
return false;
@ -1366,7 +1366,7 @@ static bool ad_convert_blank_rfork(vfs_handle_struct *handle,
/* FIXME: direct use of mmap(), vfs_aio_fork does it too */
map = mmap(NULL, maplen, PROT_READ|PROT_WRITE, MAP_SHARED,
ad->ad_fd, 0);
ad->ad_fsp->fh->fd, 0);
if (map == MAP_FAILED) {
DBG_ERR("mmap AppleDouble: %s\n", strerror(errno));
return false;
@ -1392,7 +1392,7 @@ static bool ad_convert_blank_rfork(vfs_handle_struct *handle,
return false;
}
len = sys_pwrite(ad->ad_fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
len = sys_pwrite(ad->ad_fsp->fh->fd, ad->ad_data, AD_DATASZ_DOT_UND, 0);
if (len != AD_DATASZ_DOT_UND) {
return false;
}
@ -1585,21 +1585,64 @@ exit:
static int ad_open_rsrc(vfs_handle_struct *handle,
const struct smb_filename *smb_fname,
int flags,
mode_t mode)
mode_t mode,
files_struct **_fsp)
{
int ret;
int fd;
struct smb_filename *adp_smb_fname = NULL;
files_struct *fsp = NULL;
uint32_t access_mask;
uint32_t share_access;
uint32_t create_disposition;
NTSTATUS status;
ret = adouble_path(talloc_tos(), smb_fname, &adp_smb_fname);
if (ret != 0) {
return -1;
}
fd = open(adp_smb_fname->base_name, flags, mode);
TALLOC_FREE(adp_smb_fname);
ret = SMB_VFS_STAT(handle->conn, adp_smb_fname);
if (ret != 0) {
TALLOC_FREE(adp_smb_fname);
return -1;
}
return fd;
access_mask = FILE_GENERIC_READ;
share_access = FILE_SHARE_READ | FILE_SHARE_WRITE;
create_disposition = FILE_OPEN;
if (flags & O_RDWR) {
access_mask |= FILE_GENERIC_WRITE;
share_access &= ~FILE_SHARE_WRITE;
}
status = SMB_VFS_CREATE_FILE(
handle->conn, /* conn */
NULL, /* req */
0, /* root_dir_fid */
adp_smb_fname,
access_mask,
share_access,
create_disposition,
0, /* create_options */
0, /* file_attributes */
INTERNAL_OPEN_ONLY, /* oplock_request */
NULL, /* lease */
0, /* allocation_size */
0, /* private_flags */
NULL, /* sd */
NULL, /* ea_list */
&fsp,
NULL, /* psbuf */
NULL, NULL); /* create context */
TALLOC_FREE(adp_smb_fname);
if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("SMB_VFS_CREATE_FILE failed\n");
return -1;
}
*_fsp = fsp;
return 0;
}
/*
@ -1614,7 +1657,7 @@ static int ad_open(vfs_handle_struct *handle,
int flags,
mode_t mode)
{
int fd;
int ret;
DBG_DEBUG("Path [%s] type [%s]\n", smb_fname->base_name,
ad->ad_type == ADOUBLE_META ? "meta" : "rsrc");
@ -1623,22 +1666,21 @@ static int ad_open(vfs_handle_struct *handle,
return 0;
}
if ((fsp != NULL) && (fsp->fh != NULL) && (fsp->fh->fd != -1)) {
ad->ad_fd = fsp->fh->fd;
if (fsp != NULL) {
ad->ad_fsp = fsp;
ad->ad_opened = false;
return 0;
}
fd = ad_open_rsrc(handle, smb_fname, flags, mode);
if (fd == -1) {
ret = ad_open_rsrc(handle, smb_fname, flags, mode, &ad->ad_fsp);
if (ret != 0) {
return -1;
}
ad->ad_opened = true;
ad->ad_fd = fd;
DBG_DEBUG("Path [%s] type [%s] fd [%d]\n",
DBG_DEBUG("Path [%s] type [%s]\n",
smb_fname->base_name,
ad->ad_type == ADOUBLE_META ? "meta" : "rsrc", fd);
ad->ad_type == ADOUBLE_META ? "meta" : "rsrc");
return 0;
}
@ -1654,7 +1696,7 @@ static ssize_t ad_read_rsrc_adouble(vfs_handle_struct *handle,
int ret;
bool ok;
ret = sys_fstat(ad->ad_fd, &sbuf, lp_fake_directory_create_times(
ret = sys_fstat(ad->ad_fsp->fh->fd, &sbuf, lp_fake_directory_create_times(
SNUM(handle->conn)));
if (ret != 0) {
return -1;
@ -1680,7 +1722,7 @@ static ssize_t ad_read_rsrc_adouble(vfs_handle_struct *handle,
ad->ad_data = p_ad;
}
len = sys_pread(ad->ad_fd, ad->ad_data,
len = sys_pread(ad->ad_fsp->fh->fd, ad->ad_data,
talloc_array_length(ad->ad_data), 0);
if (len != talloc_array_length(ad->ad_data)) {
DBG_NOTICE("%s %s: bad size: %zd\n",
@ -1738,10 +1780,20 @@ static ssize_t ad_read(vfs_handle_struct *handle,
static int adouble_destructor(struct adouble *ad)
{
if ((ad->ad_fd != -1) && ad->ad_opened) {
close(ad->ad_fd);
ad->ad_fd = -1;
NTSTATUS status;
if (!ad->ad_opened) {
return 0;
}
SMB_ASSERT(ad->ad_fsp != NULL);
status = close_file(NULL, ad->ad_fsp, NORMAL_CLOSE);
if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("Closing [%s] failed: %s\n",
fsp_str_dbg(ad->ad_fsp), nt_errstr(status));
}
return 0;
}
@ -1792,7 +1844,6 @@ static struct adouble *ad_alloc(TALLOC_CTX *ctx,
ad->ad_type = type;
ad->ad_magic = AD_MAGIC;
ad->ad_version = AD_VERSION;
ad->ad_fd = -1;
talloc_set_destructor(ad, adouble_destructor);