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 | 282a64b085162a58560175d14e7ceaef3d6cc9cc (patch) | |
| tree | e549cdba1167af1e19f637fb303bfc99b94ac119 | |
| parent | 6973344fb5207341e98576b1ddbe58a745225e10 (diff) | |
| download | samba-282a64b085162a58560175d14e7ceaef3d6cc9cc.tar.gz samba-282a64b085162a58560175d14e7ceaef3d6cc9cc.tar.xz samba-282a64b085162a58560175d14e7ceaef3d6cc9cc.zip | |
round lock timeouts in lockingX upwards to multiples of 1 second, so a
half second timout rounds to 1 not 0
| -rw-r--r-- | source/smbd/reply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/smbd/reply.c b/source/smbd/reply.c index c6a082d7d89..010f0e47d31 100644 --- a/source/smbd/reply.c +++ b/source/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); |