diff options
author | Volker Lendecke <vl@samba.org> | 2013-09-03 13:57:11 +0000 |
---|---|---|
committer | David Disseldorp <ddiss@samba.org> | 2013-10-24 14:22:03 +0200 |
commit | 184cc138b6fcd832fd084a919d65ad2f273bf5eb (patch) | |
tree | 6c71c407fdb75173fd7413be9f4982fcbc08e2b2 /source3/smbd/oplock.c | |
parent | bd542281bc424e4feae255df16b04f598d692304 (diff) | |
download | samba-184cc138b6fcd832fd084a919d65ad2f273bf5eb.tar.gz samba-184cc138b6fcd832fd084a919d65ad2f273bf5eb.tar.bz2 samba-184cc138b6fcd832fd084a919d65ad2f273bf5eb.zip |
smbd: Remove separate oplock_type parameter from set_file_oplock
This avoids the question where it could happen that something else but
fsp->oplock_type might be useful as an argument here.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'source3/smbd/oplock.c')
-rw-r--r-- | source3/smbd/oplock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 36a4b5ba1d..b5d6b54b14 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -50,7 +50,7 @@ void break_kernel_oplock(struct messaging_context *msg_ctx, files_struct *fsp) disabled (just sets flags). ****************************************************************************/ -NTSTATUS set_file_oplock(files_struct *fsp, int oplock_type) +NTSTATUS set_file_oplock(files_struct *fsp) { struct smbd_server_connection *sconn = fsp->conn->sconn; struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops; @@ -67,14 +67,13 @@ NTSTATUS set_file_oplock(files_struct *fsp, int oplock_type) if ((fsp->oplock_type != NO_OPLOCK) && use_kernel && - !koplocks->ops->set_oplock(koplocks, fsp, oplock_type)) + !koplocks->ops->set_oplock(koplocks, fsp, fsp->oplock_type)) { return map_nt_error_from_unix(errno); } - fsp->oplock_type = oplock_type; fsp->sent_oplock_break = NO_BREAK_SENT; - if (oplock_type == LEVEL_II_OPLOCK) { + if (fsp->oplock_type == LEVEL_II_OPLOCK) { sconn->oplocks.level_II_open++; } else if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) { sconn->oplocks.exclusive_open++; |