diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-08-18 20:13:09 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-08-18 20:13:09 +0000 |
| commit | c0f37b336bcbcab9c88c65ea8c4aabc718690535 (patch) | |
| tree | 063936745823d763e19e7a5c6cc3a9dcb21a9676 /source3 | |
| parent | ec91716cb79ee0ac059f29cbcc331c114313f1ef (diff) | |
| download | samba-c0f37b336bcbcab9c88c65ea8c4aabc718690535.tar.gz samba-c0f37b336bcbcab9c88c65ea8c4aabc718690535.tar.bz2 samba-c0f37b336bcbcab9c88c65ea8c4aabc718690535.zip | |
round lock timeouts in lockingX upwards to multiples of 1 second, so a
half second timout rounds to 1 not 0
(This used to be commit 282a64b085162a58560175d14e7ceaef3d6cc9cc)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/reply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index c6a082d7d8..010f0e47d3 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3827,7 +3827,7 @@ no oplock granted on this file (%s).\n", fsp->fnum, fsp->fsp_name)); /* Setup the timeout in seconds. */ - lock_timeout = ((lock_timeout == -1) ? -1 : lock_timeout/1000); + lock_timeout = ((lock_timeout == -1) ? -1 : (lock_timeout+999)/1000); /* Now do any requested locks */ data += ((large_file_format ? 20 : 10)*num_ulocks); |