diff options
| author | Volker Lendecke <vl@samba.org> | 2019-06-20 12:20:39 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-06-20 17:18:18 +0000 |
| commit | 67f89bb3300a4cedd2bb01f81a6ede21b05377e0 (patch) | |
| tree | 8f4e36a2e1c95ce0d88c172edfce6e889f6decb3 /source3/modules/vfs_fruit.c | |
| parent | ca73ba859ed91f272504c31d1f56f9315b7ef5c0 (diff) | |
| download | samba-67f89bb3300a4cedd2bb01f81a6ede21b05377e0.tar.gz | |
smbd: Return "blocker_pid" from do_lock()
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/modules/vfs_fruit.c')
| -rw-r--r-- | source3/modules/vfs_fruit.c | 60 |
1 files changed, 44 insertions, 16 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index f2964769a74..d8e0dbe63e6 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -2746,10 +2746,17 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, off = access_to_netatalk_brl(fork_type, FILE_READ_DATA); br_lck = do_lock( - handle->conn->sconn->msg_ctx, fsp, - fsp->op->global->open_persistent_id, 1, off, - READ_LOCK, POSIX_LOCK, false, - &status, NULL); + handle->conn->sconn->msg_ctx, + fsp, + fsp->op->global->open_persistent_id, + 1, + off, + READ_LOCK, + POSIX_LOCK, + false, /* blocking_lock */ + &status, + NULL, + NULL); TALLOC_FREE(br_lck); @@ -2763,10 +2770,17 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, off = denymode_to_netatalk_brl(fork_type, DENY_READ); br_lck = do_lock( - handle->conn->sconn->msg_ctx, fsp, - fsp->op->global->open_persistent_id, 1, off, - READ_LOCK, POSIX_LOCK, false, - &status, NULL); + handle->conn->sconn->msg_ctx, + fsp, + fsp->op->global->open_persistent_id, + 1, + off, + READ_LOCK, + POSIX_LOCK, + false, /* blocking_lock */ + &status, + NULL, + NULL); TALLOC_FREE(br_lck); @@ -2780,10 +2794,17 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, off = access_to_netatalk_brl(fork_type, FILE_WRITE_DATA); br_lck = do_lock( - handle->conn->sconn->msg_ctx, fsp, - fsp->op->global->open_persistent_id, 1, off, - READ_LOCK, POSIX_LOCK, false, - &status, NULL); + handle->conn->sconn->msg_ctx, + fsp, + fsp->op->global->open_persistent_id, + 1, + off, + READ_LOCK, + POSIX_LOCK, + false, + &status, + NULL, + NULL); TALLOC_FREE(br_lck); @@ -2797,10 +2818,17 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, off = denymode_to_netatalk_brl(fork_type, DENY_WRITE); br_lck = do_lock( - handle->conn->sconn->msg_ctx, fsp, - fsp->op->global->open_persistent_id, 1, off, - READ_LOCK, POSIX_LOCK, false, - &status, NULL); + handle->conn->sconn->msg_ctx, + fsp, + fsp->op->global->open_persistent_id, + 1, + off, + READ_LOCK, + POSIX_LOCK, + false, + &status, + NULL, + NULL); TALLOC_FREE(br_lck); |