sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3-vfs-fruit: add close call

Browse Source 
https://bugzilla.samba.org/show_bug.cgi?id=13725

We cannot always rely on vfs_default to close the fake fds. This mostly is
relevant when used with another non-local VFS filesystem module such as
gluster.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Dec 21 07:20:49 CET 2018 on sn-devel-144
This commit is contained in:
Günther Deschner 2018-12-18 17:18:33 +01:00 committed by Jeremy Allison
parent 390871602d
commit ba016939aa
1 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
source3/modules/vfs_fruit.c
View File

@ -3719,6 +3719,87 @@ static int fruit_open(vfs_handle_struct *handle,
return fd;
}
static int fruit_close_meta(vfs_handle_struct *handle,
files_struct *fsp)
{
int ret;
struct fruit_config_data *config = NULL;
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct fruit_config_data, return -1);
switch (config->meta) {
case FRUIT_META_STREAM:
ret = SMB_VFS_NEXT_CLOSE(handle, fsp);
break;
case FRUIT_META_NETATALK:
ret = close(fsp->fh->fd);
fsp->fh->fd = -1;
break;
default:
DBG_ERR("Unexpected meta config [%d]\n", config->meta);
return -1;
}
return ret;
}
static int fruit_close_rsrc(vfs_handle_struct *handle,
files_struct *fsp)
{
int ret;
struct fruit_config_data *config = NULL;
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct fruit_config_data, return -1);
switch (config->rsrc) {
case FRUIT_RSRC_STREAM:
case FRUIT_RSRC_ADFILE:
ret = SMB_VFS_NEXT_CLOSE(handle, fsp);
break;
case FRUIT_RSRC_XATTR:
ret = close(fsp->fh->fd);
fsp->fh->fd = -1;
break;
default:
DBG_ERR("Unexpected rsrc config [%d]\n", config->rsrc);
return -1;
}
return ret;
}
static int fruit_close(vfs_handle_struct *handle,
files_struct *fsp)
{
int ret;
int fd;
fd = fsp->fh->fd;
DBG_DEBUG("Path [%s] fd [%d]\n", smb_fname_str_dbg(fsp->fsp_name), fd);
if (!is_ntfs_stream_smb_fname(fsp->fsp_name)) {
return SMB_VFS_NEXT_CLOSE(handle, fsp);
}
if (is_afpinfo_stream(fsp->fsp_name)) {
ret = fruit_close_meta(handle, fsp);
} else if (is_afpresource_stream(fsp->fsp_name)) {
ret = fruit_close_rsrc(handle, fsp);
} else {
ret = SMB_VFS_NEXT_CLOSE(handle, fsp);
}
return ret;
}
static int fruit_rename(struct vfs_handle_struct *handle,
const struct smb_filename *smb_fname_src,
const struct smb_filename *smb_fname_dst)
@ -7029,6 +7110,7 @@ static struct vfs_fn_pointers vfs_fruit_fns = {
.rename_fn = fruit_rename,
.rmdir_fn = fruit_rmdir,
.open_fn = fruit_open,
.close_fn = fruit_close,
.pread_fn = fruit_pread,
.pwrite_fn = fruit_pwrite,
.pread_send_fn = fruit_pread_send,