diff options
| author | Volker Lendecke <vl@samba.org> | 2013-09-10 11:35:01 +0000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2013-09-11 08:27:10 +0200 |
| commit | e533bf3ef168424234a10331fa4edf98dacb3a4b (patch) | |
| tree | cb2b931d850ef0eefaaa1b76c68453cffcb1b1bd /source3/smbd | |
| parent | d809cf653b624a9fde48de3b0c2ab58aca705c50 (diff) | |
| download | samba-e533bf3ef168424234a10331fa4edf98dacb3a4b.tar.gz samba-e533bf3ef168424234a10331fa4edf98dacb3a4b.tar.bz2 samba-e533bf3ef168424234a10331fa4edf98dacb3a4b.zip | |
smbd: Fix blank line endings
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/blocking.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 5f6dda318e..5d198fc1f2 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -111,7 +111,7 @@ static bool recalc_brl_timeout(struct smbd_server_connection *sconn) return True; } - /* + /* to account for unclean shutdowns by clients we need a maximum timeout that we use for checking pending locks. If we have any pending locks at all, then check if the pending @@ -217,7 +217,7 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck, blr->lock_type = lock_type; blr->offset = offset; blr->count = count; - + /* Specific brl_lock() implementations can fill this in. */ blr->blr_private = NULL; @@ -332,7 +332,7 @@ static void generic_blocking_lock_error(struct blocking_lock_record *blr, NTSTAT } /**************************************************************************** - Return a lock fail error for a lockingX call. Undo all the locks we have + Return a lock fail error for a lockingX call. Undo all the locks we have obtained first. *****************************************************************************/ @@ -350,7 +350,7 @@ static void undo_locks_obtained(struct blocking_lock_record *blr) data = discard_const_p(uint8_t, blr->req->buf) + ((large_file_format ? 20 : 10)*num_ulocks); - /* + /* * Data now points at the beginning of the list * of smb_lkrng structs. */ @@ -449,7 +449,7 @@ static bool process_lockingX(struct blocking_lock_record *blr) data = discard_const_p(uint8_t, blr->req->buf) + ((large_file_format ? 20 : 10)*num_ulocks); - /* + /* * Data now points at the beginning of the list * of smb_lkrng structs. */ @@ -550,7 +550,7 @@ static bool process_trans2(struct blocking_lock_record *blr) if (ERROR_WAS_LOCK_DENIED(status)) { /* Still can't get the lock, just keep waiting. */ return False; - } + } /* * We have other than a "can't get lock" * error. Send an error and return True so we get dequeued. |