#define DBGC_CLASS DBGC_LOCKING
#include "includes.h"
+#include "lib/util/server_id.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
#include "messages.h"
-#include "../librpc/gen_ndr/open_files.h"
+#include "../librpc/gen_ndr/ndr_open_files.h"
/*
* helper function used by the kernel oplock backends to post the break message
{
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
- bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) && koplocks;
+ bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+ (koplocks != NULL);
- if (fsp->oplock_type == LEVEL_II_OPLOCK) {
- if (use_kernel &&
- !(koplocks->flags & KOPLOCKS_LEVEL2_SUPPORTED)) {
- DEBUG(10, ("Refusing level2 oplock, kernel oplocks "
- "don't support them\n"));
- return NT_STATUS_NOT_SUPPORTED;
- }
+ if (fsp->oplock_type == LEVEL_II_OPLOCK && use_kernel) {
+ DEBUG(10, ("Refusing level2 oplock, kernel oplocks "
+ "don't support them\n"));
+ return NT_STATUS_NOT_SUPPORTED;
}
if ((fsp->oplock_type != NO_OPLOCK) &&
return NT_STATUS_OK;
}
+static void release_fsp_kernel_oplock(files_struct *fsp)
+{
+ struct smbd_server_connection *sconn = fsp->conn->sconn;
+ struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
+ bool use_kernel;
+
+ if (koplocks == NULL) {
+ return;
+ }
+ use_kernel = lp_kernel_oplocks(SNUM(fsp->conn));
+ if (!use_kernel) {
+ return;
+ }
+ if (fsp->oplock_type == NO_OPLOCK) {
+ return;
+ }
+ if (fsp->oplock_type == LEASE_OPLOCK) {
+ /*
+ * For leases we don't touch kernel oplocks at all
+ */
+ return;
+ }
+
+ koplocks->ops->release_oplock(koplocks, fsp, NO_OPLOCK);
+}
+
/****************************************************************************
Attempt to release an oplock on a file. Decrements oplock count.
****************************************************************************/
static void release_file_oplock(files_struct *fsp)
{
struct smbd_server_connection *sconn = fsp->conn->sconn;
- struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
- if ((fsp->oplock_type != NO_OPLOCK) &&
- koplocks) {
- koplocks->ops->release_oplock(koplocks, fsp, NO_OPLOCK);
- }
+ release_fsp_kernel_oplock(fsp);
if (fsp->oplock_type == LEVEL_II_OPLOCK) {
sconn->oplocks.level_II_open--;
{
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
+ bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+ (koplocks != NULL);
if (!EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
DEBUG(0, ("trying to downgrade an already-downgraded oplock!\n"));
return;
}
- if (koplocks) {
+ if (use_kernel) {
koplocks->ops->release_oplock(koplocks, fsp, LEVEL_II_OPLOCK);
}
fsp->oplock_type = LEVEL_II_OPLOCK;
TALLOC_FREE(fsp->oplock_timeout);
}
-uint32_t map_oplock_to_lease_type(uint16_t op_type)
-{
- uint32_t ret;
-
- switch(op_type) {
- case BATCH_OPLOCK:
- case BATCH_OPLOCK|EXCLUSIVE_OPLOCK:
- ret = SMB2_LEASE_READ|SMB2_LEASE_WRITE|SMB2_LEASE_HANDLE;
- break;
- case EXCLUSIVE_OPLOCK:
- ret = SMB2_LEASE_READ|SMB2_LEASE_WRITE;
- break;
- case LEVEL_II_OPLOCK:
- ret = SMB2_LEASE_READ;
- break;
- default:
- ret = SMB2_LEASE_NONE;
- break;
- }
- return ret;
-}
-
-uint32_t get_lease_type(struct share_mode_data *d, struct share_mode_entry *e)
+uint32_t get_lease_type(const struct share_mode_data *d,
+ const struct share_mode_entry *e)
{
if (e->op_type == LEASE_OPLOCK) {
return d->leases[e->lease_idx].current_state;
uint32_t num_read_oplocks = 0;
uint32_t i;
- if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
+ if (fsp_lease_type_is_exclusive(fsp)) {
+ const struct share_mode_entry *e = NULL;
+ uint32_t e_lease_type = 0;
+
/*
- * If we're the only one, we don't need a brlock entry
+ * If we're fully exclusive, we don't need a brlock entry
*/
- SMB_ASSERT(d->num_share_modes == 1);
- SMB_ASSERT(EXCLUSIVE_OPLOCK_TYPE(d->share_modes[0].op_type));
+ remove_stale_share_mode_entries(d);
+
+ e = find_share_mode_entry(lck, fsp);
+ if (e != NULL) {
+ e_lease_type = get_lease_type(d, e);
+ }
+
+ if (!lease_type_is_exclusive(e_lease_type)) {
+ char *timestr = NULL;
+
+ timestr = timeval_string(talloc_tos(),
+ &fsp->open_time,
+ true);
+
+ NDR_PRINT_DEBUG(share_mode_data, d);
+ DBG_ERR("file [%s] file_id [%s] gen_id [%lu] "
+ "open_time[%s] lease_type [0x%x] "
+ "oplock_type [0x%x]\n",
+ fsp_str_dbg(fsp),
+ file_id_string_tos(&fsp->file_id),
+ fsp->fh->gen_id, timestr,
+ e_lease_type, fsp->oplock_type);
+
+ smb_panic("Found non-exclusive lease");
+ }
+
return true;
}
return true;
}
+/****************************************************************************
+ Remove a file oplock with lock already held. Copes with level II and exclusive.
+****************************************************************************/
+
+bool remove_oplock_under_lock(files_struct *fsp, struct share_mode_lock *lck)
+{
+ bool ret;
+
+ ret = remove_share_oplock(lck, fsp);
+ if (!ret) {
+ DBG_ERR("failed to remove share oplock for "
+ "file %s, %s, %s\n",
+ fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
+ file_id_string_tos(&fsp->file_id));
+ }
+ release_file_oplock(fsp);
+
+ ret = update_num_read_oplocks(fsp, lck);
+ if (!ret) {
+ DBG_ERR("update_num_read_oplocks failed for "
+ "file %s, %s, %s\n",
+ fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
+ file_id_string_tos(&fsp->file_id));
+ }
+
+ return ret;
+}
+
/****************************************************************************
Remove a file oplock. Copes with level II and exclusive.
Locks then unlocks the share mode lock. Client can decide to go directly
bool ret;
struct share_mode_lock *lck;
- DEBUG(10, ("remove_oplock called for %s\n",
- fsp_str_dbg(fsp)));
+ DBG_DEBUG("remove_oplock called for %s\n", fsp_str_dbg(fsp));
/* Remove the oplock flag from the sharemode. */
lck = get_existing_share_mode_lock(talloc_tos(), fsp->file_id);
if (lck == NULL) {
- DEBUG(0,("remove_oplock: failed to lock share entry for "
- "file %s\n", fsp_str_dbg(fsp)));
- return False;
- }
-
- ret = remove_share_oplock(lck, fsp);
- if (!ret) {
- DEBUG(0,("remove_oplock: failed to remove share oplock for "
- "file %s, %s, %s\n",
- fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
- file_id_string_tos(&fsp->file_id)));
+ DBG_ERR("failed to lock share entry for "
+ "file %s\n", fsp_str_dbg(fsp));
+ return false;
}
- release_file_oplock(fsp);
- ret = update_num_read_oplocks(fsp, lck);
- if (!ret) {
- DEBUG(0, ("%s: update_num_read_oplocks failed for "
- "file %s, %s, %s\n",
- __func__, fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
- file_id_string_tos(&fsp->file_id)));
- }
+ ret = remove_oplock_under_lock(fsp, lck);
TALLOC_FREE(lck);
return ret;
struct share_mode_lock *lck;
uint16_t old_epoch = lease->lease.lease_epoch;
+ /*
+ * This function runs without any specific impersonation
+ * and must not call any SMB_VFS operations!
+ */
+
fsp = file_find_one_fsp_from_lease_key(lease->sconn,
&lease->lease.lease_key);
if (fsp == NULL) {
return;
}
+ /*
+ * Paranoia check: There can only be one fsp_lease per lease
+ * key
+ */
+ SMB_ASSERT(fsp->lease == lease);
+
lck = get_existing_share_mode_lock(
talloc_tos(), fsp->file_id);
if (lck == NULL) {
struct share_mode_lease *l = NULL;
idx = find_share_mode_lease(d, client_guid, &lease->lease.lease_key);
- if (idx != -1) {
- l = &d->leases[idx];
- }
-
- if (l == NULL) {
+ if (idx == -1) {
DEBUG(1, ("%s: Could not find lease entry\n", __func__));
TALLOC_FREE(lease->timeout);
lease->lease.lease_state = SMB2_LEASE_NONE;
return false;
}
+ l = &d->leases[idx];
+
DEBUG(10,("%s: refresh lease state\n", __func__));
/* Ensure we're in sync with current lease state. */
DEBUG(10,("%s: setup timeout handler\n", __func__));
- lease->timeout = tevent_add_timer(lease->sconn->ev_ctx,
+ /*
+ * lease_timeout_handler() only accesses locking.tdb
+ * so we don't use any impersonation and use
+ * the raw tevent context.
+ */
+ lease->timeout = tevent_add_timer(lease->sconn->raw_ev_ctx,
lease, t,
lease_timeout_handler,
lease);
{
struct smbd_server_connection *sconn = xconn->client->sconn;
struct share_mode_lock *lck;
+ struct share_mode_data *d = NULL;
struct share_mode_lease *l = NULL;
const struct file_id id = ids[0];
+ int idx;
uint32_t i;
NTSTATUS status;
if (lck == NULL) {
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
- status = downgrade_share_lease(sconn, lck, key, lease_state, &l);
+ d = lck->data;
- DEBUG(10, ("%s: Downgrading %s to %x => %s\n", __func__,
- file_id_string_tos(&id), (unsigned)lease_state, nt_errstr(status)));
+ idx = find_share_mode_lease(
+ d, &sconn->client->connections->smb2.client.guid, key);
+ if (idx == -1) {
+ DEBUG(10, ("lease not found\n"));
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+ l = &d->leases[idx];
+
+ if (!l->breaking) {
+ DBG_WARNING("Attempt to break from %"PRIu32" to %"PRIu32" - "
+ "but we're not in breaking state\n",
+ l->current_state, lease_state);
+ TALLOC_FREE(lck);
+ return NT_STATUS_UNSUCCESSFUL;
+ }
+
+ /*
+ * Can't upgrade anything: l->breaking_to_requested (and l->current_state)
+ * must be a strict bitwise superset of new_lease_state
+ */
+ if ((lease_state & l->breaking_to_requested) != lease_state) {
+ DBG_WARNING("Attempt to upgrade from %"PRIu32" to %"PRIu32" "
+ "- expected %"PRIu32"\n",
+ l->current_state, lease_state,
+ l->breaking_to_requested);
+ TALLOC_FREE(lck);
+ return NT_STATUS_REQUEST_NOT_ACCEPTED;
+ }
+
+ if (l->current_state != lease_state) {
+ l->current_state = lease_state;
+ d->modified = true;
+ }
+
+ status = NT_STATUS_OK;
+
+ d->modified = true;
- if (NT_STATUS_EQUAL(status, NT_STATUS_OPLOCK_BREAK_IN_PROGRESS)) {
+ if ((lease_state & ~l->breaking_to_required) != 0) {
struct downgrade_lease_additional_state *state;
+ DBG_INFO("lease state %"PRIu32" not fully broken from "
+ "%"PRIu32" to %"PRIu32"\n",
+ lease_state,
+ l->current_state,
+ l->breaking_to_required);
+
+ l->breaking_to_requested = l->breaking_to_required;
+
+ if (l->current_state & (SMB2_LEASE_WRITE|SMB2_LEASE_HANDLE)) {
+ /*
+ * Here we break in steps, as windows does
+ * see the breaking3 and v2_breaking3 tests.
+ */
+ l->breaking_to_requested |= SMB2_LEASE_READ;
+ }
+
state = talloc_zero(xconn,
struct downgrade_lease_additional_state);
if (state == NULL) {
}
state->xconn = xconn;
- if (l->current_state & (~SMB2_LEASE_READ)) {
- state->break_flags = SMB2_NOTIFY_BREAK_LEASE_FLAG_ACK_REQUIRED;
- }
state->lease_key = l->lease_key;
state->break_from = l->current_state;
state->break_to = l->breaking_to_requested;
state->new_epoch = l->epoch;
}
- if (state->break_flags == 0) {
+ if (l->current_state & (SMB2_LEASE_WRITE|SMB2_LEASE_HANDLE)) {
+ state->break_flags =
+ SMB2_NOTIFY_BREAK_LEASE_FLAG_ACK_REQUIRED;
+ } else {
/*
* This is an async break without
* SMB2_NOTIFY_BREAK_LEASE_FLAG_ACK_REQUIRED
lck->data->modified = true;
}
- tevent_schedule_immediate(state->im, xconn->ev_ctx,
+ tevent_schedule_immediate(state->im,
+ xconn->client->raw_ev_ctx,
downgrade_lease_additional_trigger,
state);
+
+ status = NT_STATUS_OPLOCK_BREAK_IN_PROGRESS;
+ } else {
+ DBG_DEBUG("breaking from %"PRIu32" to %"PRIu32" - "
+ "expected %"PRIu32"\n",
+ l->current_state,
+ lease_state,
+ l->breaking_to_requested);
+
+ l->breaking_to_requested = 0;
+ l->breaking_to_required = 0;
+ l->breaking = false;
+
+ d->modified = true;
}
+ DEBUG(10, ("%s: Downgrading %s to %x => %s\n", __func__,
+ file_id_string_tos(&id), (unsigned)lease_state, nt_errstr(status)));
+
{
struct downgrade_lease_fsps_state state = {
.id = id, .lck = lck, .key = key,
{
files_struct *fsp = (files_struct *)private_data;
+ /*
+ * Note this function doesn't run under any specific impersonation and
+ * is not expected to call any SMB_VFS operation!
+ */
+
SMB_ASSERT(fsp->sent_oplock_break != NO_BREAK_SENT);
/* Remove the timed event handler. */
static void add_oplock_timeout_handler(files_struct *fsp)
{
- struct smbd_server_connection *sconn = fsp->conn->sconn;
- struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
-
- /*
- * If kernel oplocks already notifies smbds when an oplock break times
- * out, just return.
- */
- if (koplocks &&
- (koplocks->flags & KOPLOCKS_TIMEOUT_NOTIFICATION)) {
- return;
- }
-
if (fsp->oplock_timeout != NULL) {
DEBUG(0, ("Logic problem -- have an oplock event hanging "
"around\n"));
}
+ /*
+ * For now we keep the logic and use the
+ * raw event context. We're called from
+ * the messaging system from a raw event context.
+ * Also oplock_timeout_handler doesn't invoke
+ * SMB_VFS calls.
+ */
fsp->oplock_timeout =
- tevent_add_timer(fsp->conn->sconn->ev_ctx, fsp,
+ tevent_add_timer(fsp->conn->sconn->raw_ev_ctx, fsp,
timeval_current_ofs(OPLOCK_BREAK_TIMEOUT, 0),
oplock_timeout_handler, fsp);
struct server_id src,
DATA_BLOB *data)
{
+ struct file_id id;
struct share_mode_entry msg;
files_struct *fsp;
bool use_kernel;
}
/* De-linearize incoming message. */
- message_to_share_mode_entry(&msg, (char *)data->data);
+ message_to_share_mode_entry(&id, &msg, (char *)data->data);
break_to = msg.op_type;
DEBUG(10, ("Got oplock break to %u message from pid %s: %s/%llu\n",
(unsigned)break_to, server_id_str_buf(src, &tmp),
- file_id_string_tos(&msg.id),
+ file_id_string_tos(&id),
(unsigned long long)msg.share_file_id));
- fsp = initial_break_processing(sconn, msg.id, msg.share_file_id);
+ fsp = initial_break_processing(sconn, id, msg.share_file_id);
if (fsp == NULL) {
/* We hit a race here. Break messages are sent, and before we
break_to &= ~SMB2_LEASE_READ;
}
- use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) && koplocks;
- if (use_kernel && !(koplocks->flags & KOPLOCKS_LEVEL2_SUPPORTED)) {
+ use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
+ (koplocks != NULL);
+ if (use_kernel) {
DEBUG(10, ("Kernel oplocks don't allow level2\n"));
break_to &= ~SMB2_LEASE_READ;
}
add_oplock_timeout_handler(fsp);
}
+static bool file_has_read_oplocks(struct files_struct *fsp)
+{
+ struct byte_range_lock *brl;
+ uint32_t num_read_oplocks = 0;
+
+ brl = brl_get_locks_readonly(fsp);
+ if (brl == NULL) {
+ return false;
+ }
+
+ num_read_oplocks = brl_num_read_oplocks(brl);
+
+ DBG_DEBUG("num_read_oplocks = %"PRIu32"\n", num_read_oplocks);
+
+ return (num_read_oplocks != 0);
+}
+
struct break_to_none_state {
struct smbd_server_connection *sconn;
struct file_id id;
struct smbd_server_connection *sconn = fsp->conn->sconn;
struct tevent_immediate *im;
struct break_to_none_state *state;
- struct byte_range_lock *brl;
- uint32_t num_read_oplocks = 0;
+ bool has_read_oplocks;
/*
* If this file is level II oplocked then we need
* the shared memory area whilst doing this.
*/
- if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
+ if (fsp_lease_type_is_exclusive(fsp)) {
/*
* There can't be any level2 oplocks, we're alone.
*/
return;
}
- brl = brl_get_locks_readonly(fsp);
- if (brl != NULL) {
- num_read_oplocks = brl_num_read_oplocks(brl);
- }
-
- DEBUG(10, ("num_read_oplocks = %"PRIu32"\n", num_read_oplocks));
-
- if (num_read_oplocks == 0) {
+ has_read_oplocks = file_has_read_oplocks(fsp);
+ if (!has_read_oplocks) {
DEBUG(10, ("No read oplocks around\n"));
return;
}
}
static void send_break_to_none(struct messaging_context *msg_ctx,
+ const struct file_id *id,
const struct share_mode_entry *e)
{
char msg[MSG_SMB_SHARE_MODE_ENTRY_SIZE];
- share_mode_entry_to_message(msg, e);
+ share_mode_entry_to_message(msg, id, e);
/* Overload entry->op_type */
SSVAL(msg, OP_BREAK_MSG_OP_TYPE_OFFSET, NO_OPLOCK);
messaging_send_buf(msg_ctx, e->pid, MSG_SMB_BREAK_REQUEST,
- (uint8 *)msg, sizeof(msg));
+ (uint8_t *)msg, sizeof(msg));
}
static void do_break_to_none(struct tevent_context *ctx,
for (i=0; i<d->num_leases; i++) {
struct share_mode_lease *l = &d->leases[i];
- struct share_mode_entry *e;
+ struct share_mode_entry *e = NULL;
uint32_t j;
if ((l->current_state & SMB2_LEASE_READ) == 0) {
DEBUG(10, ("Breaking lease# %"PRIu32" with share_entry# "
"%"PRIu32"\n", i, j));
- send_break_to_none(state->sconn->msg_ctx, e);
+ send_break_to_none(state->sconn->msg_ctx, &state->id, e);
}
for(i = 0; i < d->num_share_modes; i++) {
/* Paranoia .... */
if (EXCLUSIVE_OPLOCK_TYPE(e->op_type)) {
DEBUG(0,("%s: PANIC. "
- "share mode entry %d is an exlusive "
+ "share mode entry %d is an exclusive "
"oplock !\n", __func__, i ));
TALLOC_FREE(lck);
abort();
}
- send_break_to_none(state->sconn->msg_ctx, e);
+ send_break_to_none(state->sconn->msg_ctx, &state->id, e);
}
/* We let the message receivers handle removing the oplock state
void smbd_contend_level2_oplocks_begin(files_struct *fsp,
enum level2_contention_type type)
{
- struct smbd_server_connection *sconn = fsp->conn->sconn;
- struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
-
- if (koplocks && koplocks->ops->contend_level2_oplocks_begin) {
- koplocks->ops->contend_level2_oplocks_begin(fsp, type);
- return;
- }
-
contend_level2_oplocks_begin_default(fsp, type);
}
void smbd_contend_level2_oplocks_end(files_struct *fsp,
enum level2_contention_type type)
{
- struct smbd_server_connection *sconn = fsp->conn->sconn;
- struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
-
- /* Only kernel oplocks implement this so far */
- if (koplocks && koplocks->ops->contend_level2_oplocks_end) {
- koplocks->ops->contend_level2_oplocks_end(fsp, type);
- }
+ return;
}
/****************************************************************************
Linearize a share mode entry struct to an internal oplock break message.
****************************************************************************/
-void share_mode_entry_to_message(char *msg, const struct share_mode_entry *e)
+void share_mode_entry_to_message(char *msg, const struct file_id *id,
+ const struct share_mode_entry *e)
{
- SIVAL(msg,OP_BREAK_MSG_PID_OFFSET,(uint32)e->pid.pid);
+ SIVAL(msg,OP_BREAK_MSG_PID_OFFSET,(uint32_t)e->pid.pid);
SBVAL(msg,OP_BREAK_MSG_MID_OFFSET,e->op_mid);
SSVAL(msg,OP_BREAK_MSG_OP_TYPE_OFFSET,e->op_type);
SIVAL(msg,OP_BREAK_MSG_ACCESS_MASK_OFFSET,e->access_mask);
SIVAL(msg,OP_BREAK_MSG_PRIV_OFFSET,e->private_options);
SIVAL(msg,OP_BREAK_MSG_TIME_SEC_OFFSET,(uint32_t)e->time.tv_sec);
SIVAL(msg,OP_BREAK_MSG_TIME_USEC_OFFSET,(uint32_t)e->time.tv_usec);
- push_file_id_24(msg+OP_BREAK_MSG_DEV_OFFSET, &e->id);
+ /*
+ * "id" used to be part of share_mode_entry, thus the strange
+ * place to put this. Feel free to move somewhere else :-)
+ */
+ push_file_id_24(msg+OP_BREAK_MSG_DEV_OFFSET, id);
SIVAL(msg,OP_BREAK_MSG_FILE_ID_OFFSET,e->share_file_id);
SIVAL(msg,OP_BREAK_MSG_UID_OFFSET,e->uid);
SSVAL(msg,OP_BREAK_MSG_FLAGS_OFFSET,e->flags);
De-linearize an internal oplock break message to a share mode entry struct.
****************************************************************************/
-void message_to_share_mode_entry(struct share_mode_entry *e, const char *msg)
+void message_to_share_mode_entry(struct file_id *id,
+ struct share_mode_entry *e,
+ const char *msg)
{
e->pid.pid = (pid_t)IVAL(msg,OP_BREAK_MSG_PID_OFFSET);
e->op_mid = BVAL(msg,OP_BREAK_MSG_MID_OFFSET);
e->private_options = IVAL(msg,OP_BREAK_MSG_PRIV_OFFSET);
e->time.tv_sec = (time_t)IVAL(msg,OP_BREAK_MSG_TIME_SEC_OFFSET);
e->time.tv_usec = (int)IVAL(msg,OP_BREAK_MSG_TIME_USEC_OFFSET);
- pull_file_id_24(msg+OP_BREAK_MSG_DEV_OFFSET, &e->id);
+ /*
+ * "id" used to be part of share_mode_entry, thus the strange
+ * place to put this. Feel free to move somewhere else :-)
+ */
+ pull_file_id_24(msg+OP_BREAK_MSG_DEV_OFFSET, id);
e->share_file_id = (unsigned long)IVAL(msg,OP_BREAK_MSG_FILE_ID_OFFSET);
- e->uid = (uint32)IVAL(msg,OP_BREAK_MSG_UID_OFFSET);
- e->flags = (uint16)SVAL(msg,OP_BREAK_MSG_FLAGS_OFFSET);
+ e->uid = (uint32_t)IVAL(msg,OP_BREAK_MSG_UID_OFFSET);
+ e->flags = (uint16_t)SVAL(msg,OP_BREAK_MSG_FLAGS_OFFSET);
e->name_hash = IVAL(msg,OP_BREAK_MSG_NAME_HASH_OFFSET);
e->pid.vnn = IVAL(msg,OP_BREAK_MSG_VNN_OFFSET);
}
/* only initialize once */
if (koplocks == NULL) {
-#if HAVE_KERNEL_OPLOCKS_IRIX
- koplocks = irix_init_kernel_oplocks(sconn);
-#elif HAVE_KERNEL_OPLOCKS_LINUX
+#ifdef HAVE_KERNEL_OPLOCKS_LINUX
koplocks = linux_init_kernel_oplocks(sconn);
#endif
sconn->oplocks.kernel_ops = koplocks;
git.samba.org / garming / samba-autobuild / .git / blobdiff