diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-15 09:52:07 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-07-22 15:32:39 +0200 |
| commit | 823215bf98754c5438c055475a56afec2bddcf22 (patch) | |
| tree | a7e8defd570736a96244ba8caf0cdc4c770b2370 /source3/smbd/blocking.c | |
| parent | bd787beee9666443bf44a6625800534e97ed0bfc (diff) | |
| download | samba-823215bf98754c5438c055475a56afec2bddcf22.tar.gz samba-823215bf98754c5438c055475a56afec2bddcf22.tar.xz samba-823215bf98754c5438c055475a56afec2bddcf22.zip | |
smbd: "err" is no longer set in get_lock_offset
This was only referenced in the !HAVE_LONGLONG section
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd/blocking.c')
| -rw-r--r-- | source3/smbd/blocking.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 47ac4cc402..5d3672e783 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -357,11 +357,10 @@ static void undo_locks_obtained(struct blocking_lock_record *blr) */ for(i = blr->lock_num - 1; i >= 0; i--) { - bool err; smblctx = get_lock_pid( data, i, large_file_format); count = get_lock_count( data, i, large_file_format); - offset = get_lock_offset( data, i, large_file_format, &err); + offset = get_lock_offset( data, i, large_file_format); /* * We know err cannot be set as if it was the lock @@ -469,7 +468,6 @@ static bool process_lockingX(struct blocking_lock_record *blr) for(; blr->lock_num < num_locks; blr->lock_num++) { struct byte_range_lock *br_lck = NULL; - bool err; /* * Ensure the blr record gets updated with @@ -478,7 +476,7 @@ static bool process_lockingX(struct blocking_lock_record *blr) blr->smblctx = get_lock_pid( data, blr->lock_num, large_file_format); blr->count = get_lock_count( data, blr->lock_num, large_file_format); - blr->offset = get_lock_offset( data, blr->lock_num, large_file_format, &err); + blr->offset = get_lock_offset( data, blr->lock_num, large_file_format); /* * We know err cannot be set as if it was the lock |