s3/locking: remove now unused private_options from share_mode_entry

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

diff --git a/source3/librpc/idl/open_files.idl b/source3/librpc/idl/open_files.idl
index 9f1d33a60d08c85e377d10b5b379165c8ce44271..f7582885ca4cb32594716afd8dd9f881bd3e836a 100644 (file)
--- a/source3/librpc/idl/open_files.idl
+++ b/source3/librpc/idl/open_files.idl
@@ -36,7 +36,6 @@ interface open_files
                smb2_lease_key  lease_key;
                uint32          access_mask;
                uint32          share_access;
-               uint32          private_options;
                timeval         time;
                udlong          share_file_id;
                uint32          uid;

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 505f0b5ad076de279ee52992a01aa5eb92e90143..9a45424cf3d4bf88ddab2407d3d9b66c3556580d 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -436,12 +436,12 @@ char *share_mode_str(TALLOC_CTX *ctx, int num,
        struct file_id_buf ftmp;
 
        return talloc_asprintf(ctx, "share_mode_entry[%d]: "
-                "pid = %s, share_access = 0x%x, private_options = 0x%x, "
+                "pid = %s, share_access = 0x%x, "
                 "access_mask = 0x%x, mid = 0x%llx, type= 0x%x, gen_id = %llu, "
                 "uid = %u, flags = %u, file_id %s, name_hash = 0x%x",
                 num,
                 server_id_str_buf(e->pid, &tmp),
-                e->share_access, e->private_options,
+                e->share_access,
                 e->access_mask, (unsigned long long)e->op_mid,
                 e->op_type, (unsigned long long)e->share_file_id,
                 (unsigned int)e->uid, (unsigned int)e->flags,

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index fa6cd4230e02dd6b292f61f9a68f79faf2b69549..2baf12c7e69ca16de5b4581902d26ed23e787884 100644 (file)
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -328,13 +328,13 @@ static struct share_mode_data *share_mode_memcache_fetch(
 }
 
 /*
- * 132 is the sizeof an ndr-encoded struct share_mode_entry_buf.
+ * 124 is the sizeof an ndr-encoded struct share_mode_entry_buf.
  * Reading/writing entries will immediately error out if this
  * size differs (push/pull is done without allocs).
  */
 
 struct share_mode_entry_buf {
-       uint8_t buf[132];
+       uint8_t buf[124];
 };
 #define SHARE_MODE_ENTRY_SIZE (sizeof(struct share_mode_entry_buf))
 
@@ -2072,7 +2072,6 @@ bool set_share_mode(struct share_mode_lock *lck,
        e = (struct share_mode_entry) {
                .pid = my_pid,
                .share_access = share_access,
-               .private_options = fh_get_private_options(fsp->fh),
                .access_mask = access_mask,
                .op_mid = mid,
                .op_type = op_type,

diff --git a/source3/smbd/durable.c b/source3/smbd/durable.c
index 71cd3a01f990ff7473ae4ad0c4fa63b080e85806..8e35e32538d358dfc81a85f85b2a3d3a8d0341a0 100644 (file)
--- a/source3/smbd/durable.c
+++ b/source3/smbd/durable.c
@@ -595,7 +595,6 @@ static void vfs_default_durable_reconnect_fn(struct share_mode_lock *lck,
                goto fail;
        }
 
-       fh_set_private_options(fsp->fh, e.private_options);
        fsp_apply_share_entry_flags(fsp, e.flags);
        fsp->open_time = e.time;
        fsp->access_mask = e.access_mask;

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 806168ae902bae8b46159bfc2b24f3065c6c93bd..f02b75b7f5495d421ca26839b1d3e67498515904 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -264,9 +264,9 @@ static int print_share_mode(struct file_id fid,
                                fprintf(stderr,
                                        "unknown-please report ! "
                                        "e->share_access = 0x%x, "
-                                       "e->private_options = 0x%x\n",
+                                       "e->flags = 0x%x\n",
                                        (unsigned int)e->share_access,
-                                       (unsigned int)e->private_options);
+                                       (unsigned int)e->flags);
                                break;
                        }
                }