From 49e19cf1df661af13fedca3eefb2730256dfdc27 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Mon, 17 Mar 2025 12:16:40 +0100 Subject: [PATCH] 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 Reviewed-by: Volker Lendecke --- source3/include/smb.h | 2 +- source3/locking/share_mode_lock.c | 2 +- source3/smbd/close.c | 2 +- source3/smbd/dir.c | 2 +- source3/smbd/smb2_oplock.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source3/include/smb.h b/source3/include/smb.h index 2642e364d0a..e269c6a89e8 100644 --- 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 126e2e4cc14..43886937119 100644 --- 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 d249271a82f..6addab5b4c1 100644 --- 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 31a840bd658..137d9a1dacd 100644 --- 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 c278db25239..84e48f9a648 100644 --- 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; -- 2.47.3