s3: Make open_file_ntcreate a bit easier to read

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

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index fefed85d0c4639fa36236911b64244990bbca989..17d9f6f8fb69cce4bf69abe3a6880365d4a71857 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -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,
@@ -2370,10 +2376,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 +2402,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 +2423,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)) ||