s3: Make open_file_ntcreate a bit easier to read

Move the declaration of "id" closer to its use

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 17d9f6f8fb69cce4bf69abe3a6880365d4a71857..10606788b40abb73e5a0bbae3e55d00f1762bdfa 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -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