smbd: Unify parameters to set_oplock_type
authorVolker Lendecke <vl@samba.org>
Tue, 3 Sep 2013 13:27:49 +0000 (13:27 +0000)
committerDavid Disseldorp <ddiss@samba.org>
Thu, 24 Oct 2013 12:21:59 +0000 (14:21 +0200)
Some lines above we set fsp->oplock_type = e->op_type. I don't see
how this might have changed. This change will unify both callers of
set_file_oplock. In the next step the second parameter to set_file_oplock
will be removed.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
source3/smbd/durable.c

index 9b05d48..15d7005 100644 (file)
@@ -864,7 +864,7 @@ NTSTATUS vfs_default_durable_reconnect(struct connection_struct *conn,
                return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
 
-       status = set_file_oplock(fsp, e->op_type);
+       status = set_file_oplock(fsp, fsp->oplock_type);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1, ("vfs_default_durable_reconnect failed to set oplock "
                          "after opening file: %s\n", nt_errstr(status)));