s3: Add some const to find_oplock_types

[mat/samba.git] / source3 / smbd / open.c

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 4ea51dd4e9a46e04ef6094bebbc254adaa9a9159..8b7b47b7ebc46d9fa251bbdd1babdb50f41c031b 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1084,7 +1084,7 @@ static NTSTATUS send_break_message(files_struct *fsp,
 
 static void find_oplock_types(files_struct *fsp,
                                int oplock_request,
-                               struct share_mode_lock *lck,
+                               const struct share_mode_lock *lck,
                                struct share_mode_entry **pp_batch,
                                struct share_mode_entry **pp_ex_or_batch,
                                bool *got_level2,
@@ -1639,7 +1639,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        bool posix_open = False;
        bool new_file_created = False;
        bool clear_ads = false;
-       struct file_id id;
        NTSTATUS fsp_open = NT_STATUS_ACCESS_DENIED;
        mode_t new_unx_mode = (mode_t)0;
        mode_t unx_mode = (mode_t)0;
@@ -1651,8 +1650,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
        NTSTATUS status;
        char *parent_dir;
 
-       ZERO_STRUCT(id);
-
        if (conn->printer) {
                /*
                 * Printers are handled completely differently.
@@ -1958,6 +1955,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                struct share_mode_entry *exclusive_entry = NULL;
                bool got_level2_oplock = false;
                bool got_a_none_oplock = false;
+               struct file_id id;
 
                struct timespec old_write_time = smb_fname->st.st_ex_mtime;
                id = vfs_file_id_from_sbuf(conn, &smb_fname->st);
@@ -2191,6 +2189,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                bool got_level2_oplock = false;
                bool got_a_none_oplock = false;
                struct timespec old_write_time = smb_fname->st.st_ex_mtime;
+               struct file_id id;
                /*
                 * Deal with the race condition where two smbd's detect the
                 * file doesn't exist and do the create at the same time. One
@@ -2402,10 +2401,6 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                fsp->oplock_type = NO_OPLOCK;
        }
 
-       if (info == FILE_WAS_OVERWRITTEN || info == FILE_WAS_CREATED || info == FILE_WAS_SUPERSEDED) {
-               new_file_created = True;
-       }
-
        set_share_mode(lck, fsp, get_current_uid(conn),
                        req ? req->mid : 0,
                       fsp->oplock_type);
@@ -2427,6 +2422,12 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                fsp->initial_delete_on_close = True;
        }
 
+       if (info == FILE_WAS_OVERWRITTEN
+           || info == FILE_WAS_CREATED
+           || info == FILE_WAS_SUPERSEDED) {
+               new_file_created = True;
+       }
+
        if (new_file_created) {
                /* Files should be initially set as archive */
                if (lp_map_archive(SNUM(conn)) ||