sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

smbd: Slightly simplify smb_set_posix_lock()

Browse Source 
Avoid indentation by an early return;

Best viewed with git show -b

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Volker Lendecke 2019-06-11 05:04:39 -07:00 committed by Jeremy Allison
parent 8d4f7e564f
commit 7dce1d3eeb
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
source3/smbd/trans2.c
View File

@ -7277,6 +7277,8 @@ static NTSTATUS smb_set_posix_lock(connection_struct *conn,
uint64_t smblctx;
bool blocking_lock = False;
enum brl_type lock_type;
uint64_t block_smblctx;
struct byte_range_lock *br_lck;
NTSTATUS status = NT_STATUS_OK;
@ -7339,44 +7341,43 @@ static NTSTATUS smb_set_posix_lock(connection_struct *conn,
count,
offset,
POSIX_LOCK);
} else {
uint64_t block_smblctx;
struct byte_range_lock *br_lck = do_lock(req->sconn->msg_ctx,
fsp,
smblctx,
count,
offset,
lock_type,
POSIX_LOCK,
blocking_lock,
&status,
&block_smblctx);
if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) {
/*
* A blocking lock was requested. Package up
* this smb into a queued request and push it
* onto the blocking lock queue.
*/
if(push_blocking_lock_request(br_lck,
req,
fsp,
-1, /* infinite timeout. */
0,
smblctx,
lock_type,
POSIX_LOCK,
offset,
count,
block_smblctx)) {
TALLOC_FREE(br_lck);
return status;
}
}
TALLOC_FREE(br_lck);
return status;
}
br_lck = do_lock(req->sconn->msg_ctx,
fsp,
smblctx,
count,
offset,
lock_type,
POSIX_LOCK,
blocking_lock,
&status,
&block_smblctx);
if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) {
/*
* A blocking lock was requested. Package up this smb
* into a queued request and push it onto the blocking
* lock queue.
*/
if(push_blocking_lock_request(br_lck,
req,
fsp,
-1, /* infinite timeout. */
0,
smblctx,
lock_type,
POSIX_LOCK,
offset,
count,
block_smblctx)) {
TALLOC_FREE(br_lck);
return status;
}
}
TALLOC_FREE(br_lck);
return status;
}