sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-30 17:49:30 +03:00
Code Activity

vfs_ceph: add .fcntl_fn hook

Browse Source 
This hook is currently called via vfs_set_blocking(), so can safely be
ignored.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14241

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
David Disseldorp
2020-01-21 01:12:42 +01:00
committed by Stefan Metzmacher
parent 0a77890bbc
commit b56c56eecd
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source3/modules/vfs_ceph.c
View File

@ -975,6 +975,34 @@ static int cephwrap_kernel_flock(struct vfs_handle_struct *handle,
return -1; return -1;
} }
static int cephwrap_fcntl(vfs_handle_struct *handle,
files_struct *fsp, int cmd, va_list cmd_arg)
{
/*
* SMB_VFS_FCNTL() is currently only called by vfs_set_blocking() to
* clear O_NONBLOCK, etc for LOCK_MAND and FIFOs. Ignore it.
*/
if (cmd == F_GETFL) {
return 0;
} else if (cmd == F_SETFL) {
va_list dup_cmd_arg;
int opt;
va_copy(dup_cmd_arg, cmd_arg);
opt = va_arg(dup_cmd_arg, int);
va_end(dup_cmd_arg);
if (opt == 0) {
return 0;
}
DBG_ERR("unexpected fcntl SETFL(%d)\n", opt);
goto err_out;
}
DBG_ERR("unexpected fcntl: %d\n", cmd);
err_out:
errno = EINVAL;
return -1;
}
static bool cephwrap_getlock(struct vfs_handle_struct *handle, files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid) static bool cephwrap_getlock(struct vfs_handle_struct *handle, files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid)
{ {
DBG_DEBUG("[CEPH] getlock returning false and errno=0\n"); DBG_DEBUG("[CEPH] getlock returning false and errno=0\n");
@ -1357,6 +1385,7 @@ static struct vfs_fn_pointers ceph_fns = {
.fallocate_fn = cephwrap_fallocate, .fallocate_fn = cephwrap_fallocate,
.lock_fn = cephwrap_lock, .lock_fn = cephwrap_lock,
.kernel_flock_fn = cephwrap_kernel_flock, .kernel_flock_fn = cephwrap_kernel_flock,
.fcntl_fn = cephwrap_fcntl,
.linux_setlease_fn = cephwrap_linux_setlease, .linux_setlease_fn = cephwrap_linux_setlease,
.getlock_fn = cephwrap_getlock, .getlock_fn = cephwrap_getlock,
.symlinkat_fn = cephwrap_symlinkat, .symlinkat_fn = cephwrap_symlinkat,