s3: Make open_file_ntcreate a bit easier to read

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

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 9174388a8b4e270bf13ba7704e61d633e4714882..10606788b40abb73e5a0bbae3e55d00f1762bdfa 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1158,13 +1158,13 @@ static bool delay_for_batch_oplocks(files_struct *fsp,
        if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
                return false;
        }
-
-       if (batch_entry != NULL) {
-               /* Found a batch oplock */
-               send_break_message(fsp, batch_entry, mid, oplock_request);
-               return true;
+       if (batch_entry == NULL) {
+               return false;
        }
-       return false;
+
+       /* Found a batch oplock */
+       send_break_message(fsp, batch_entry, mid, oplock_request);
+       return true;
 }
 
 static bool delay_for_exclusive_oplocks(files_struct *fsp,
@@ -1172,20 +1172,26 @@ static bool delay_for_exclusive_oplocks(files_struct *fsp,
                                        int oplock_request,
                                        struct share_mode_entry *ex_entry)
 {
+       bool delay_it;
+
        if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
                return false;
        }
+       if (ex_entry == NULL) {
+               return false;
+       }
 
-       if (ex_entry != NULL) {
-               /* Found an exclusive or batch oplock */
-               bool delay_it = is_delete_request(fsp) ?
-                               BATCH_OPLOCK_TYPE(ex_entry->op_type) : true;
-               if (delay_it) {
-                       send_break_message(fsp, ex_entry, mid, oplock_request);
-                       return true;
-               }
+       /* Found an exclusive or batch oplock */
+
+       delay_it = is_delete_request(fsp) ?
+               BATCH_OPLOCK_TYPE(ex_entry->op_type) : true;
+
+       if (!delay_it) {
+               return false;
        }
-       return false;
+
+       send_break_message(fsp, ex_entry, mid, oplock_request);
+       return true;
 }
 
 static void grant_fsp_oplock_type(files_struct *fsp,
@@ -1633,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;
@@ -1645,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.
@@ -1952,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);
@@ -2185,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
@@ -2370,10 +2375,10 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        fsp->oplock_type = NO_OPLOCK;
                }
 
-               if (!(flags2 & O_TRUNC)) {
-                       info = FILE_WAS_OPENED;
-               } else {
+               if (flags2 & O_TRUNC) {
                        info = FILE_WAS_OVERWRITTEN;
+               } else {
+                       info = FILE_WAS_OPENED;
                }
        } else {
                info = FILE_WAS_CREATED;
@@ -2396,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);
@@ -2421,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)) ||