smbd: rename SHARE_MODE_FLAG_POSIX_OPEN to SHARE_ENTRY_FLAG_POSIX_OPEN

share_mode_data has flags and share_mode_entry has flags, this change allows
to distinguish between both more easily. No change in behaviour.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2642e364d0a57b085348be6db002b10eedd5d67f..e269c6a89e8c17477961cbb4090fbc10c648822d 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -168,7 +168,7 @@ struct interface {
        uint32_t options;
 };
 
-#define SHARE_MODE_FLAG_POSIX_OPEN     0x1
+#define SHARE_ENTRY_FLAG_POSIX_OPEN    0x1
 
 #include "librpc/gen_ndr/server_id.h"
 

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index 126e2e4cc14f0e970fdf492c76464655bd2980d5..43886937119a976adab1ad0449deafd2d86bf6b5 100644 (file)
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -2081,7 +2081,7 @@ bool set_share_mode(struct share_mode_lock *lck,
                .share_file_id = fh_get_gen_id(fsp->fh),
                .uid = (uint32_t)uid,
                .flags = fsp->fsp_flags.posix_open ?
-                       SHARE_MODE_FLAG_POSIX_OPEN : 0,
+                       SHARE_ENTRY_FLAG_POSIX_OPEN : 0,
                .name_hash = fsp->name_hash,
        };
 

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index d249271a82f90bb77ae8b14515f531f637d72791..6addab5b4c1ecf232b1f693366ff8bd39d88bbfa 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -241,7 +241,7 @@ static bool has_other_nonposix_opens_fn(
        struct has_other_nonposix_opens_state *state = private_data;
        struct files_struct *fsp = state->fsp;
 
-       if (e->flags & SHARE_MODE_FLAG_POSIX_OPEN) {
+       if (e->flags & SHARE_ENTRY_FLAG_POSIX_OPEN) {
                return false;
        }
        if (fsp != NULL) {

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 31a840bd6581e7a6efe615e8b97465231ca10e0e..137d9a1dacde51c8f5b970f0d9c8e843834f9bef 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1293,7 +1293,7 @@ static int have_file_open_below_fn(const struct share_mode_data *data,
        }
 
        if (state->dirfsp_is_posix &&
-           e->flags & SHARE_MODE_FLAG_POSIX_OPEN)
+           e->flags & SHARE_ENTRY_FLAG_POSIX_OPEN)
        {
                /* Ignore POSIX opens */
                return 0;

diff --git a/source3/smbd/smb2_oplock.c b/source3/smbd/smb2_oplock.c
index c278db2523994fc0b963bbb886963e91a17ed82e..84e48f9a64895b8606bc04627afb36cd0f614a5a 100644 (file)
--- a/source3/smbd/smb2_oplock.c
+++ b/source3/smbd/smb2_oplock.c
@@ -1737,7 +1737,7 @@ static int delay_for_handle_lease_break_below_fn(struct share_mode_data *d,
        }
 
        if ((lease & SMB2_LEASE_HANDLE) == 0) {
-               if (e->flags & SHARE_MODE_FLAG_POSIX_OPEN) {
+               if (e->flags & SHARE_ENTRY_FLAG_POSIX_OPEN) {
                        DBG_DEBUG("POSIX open file-id [%s]\n", fid_bufp);
                        /* Ignore POSIX opens. */
                        return 0;