diff options
| author | Jeremy Allison <jra@samba.org> | 2016-05-12 20:57:36 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2016-05-21 01:28:28 +0200 |
| commit | bb93b24b18f02507f7a8714bb7a79b2a763aaa1a (patch) | |
| tree | 5567488cd002a3b91af24ec7990fe1f4a0cc81c7 /source3/modules | |
| parent | 1863e6da0aeb9218394cabccf9c7a0e4507edaec (diff) | |
| download | samba-bb93b24b18f02507f7a8714bb7a79b2a763aaa1a.tar.gz | |
s3: lib: Add 'int op' parameter to fcntl_getlock().
Will allow us to move to open file description locks
from process-associated locks.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Jeff Layton <jlayton@samba.org>
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_default.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 8ee163506b4..087fb446feb 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2119,9 +2119,10 @@ static int vfswrap_kernel_flock(vfs_handle_struct *handle, files_struct *fsp, static bool vfswrap_getlock(vfs_handle_struct *handle, files_struct *fsp, off_t *poffset, off_t *pcount, int *ptype, pid_t *ppid) { bool result; + int op = F_GETLK; START_PROFILE(syscall_fcntl_getlock); - result = fcntl_getlock(fsp->fh->fd, poffset, pcount, ptype, ppid); + result = fcntl_getlock(fsp->fh->fd, op, poffset, pcount, ptype, ppid); END_PROFILE(syscall_fcntl_getlock); return result; } |