sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3: Add "share_mode_stale_pid"

Browse Source 
This is a helper routine that prunes a dead share mode entry on demand. This
prepares for removing the serverids_exist call in parse_share_modes.

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Volker Lendecke 2012-05-07 12:57:07 +02:00 committed by Jeremy Allison
parent 035342c117
commit 5842d4e025
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source3/locking/locking.c
View File

@ -625,6 +625,38 @@ bool is_deferred_open_entry(const struct share_mode_entry *e)
return (e->op_type == DEFERRED_OPEN_ENTRY);
}
/*
* In case d->share_modes[i] conflicts with something or otherwise is
* being used, we need to make sure the corresponding process still
* exists. This routine checks it and potentially removes the entry
* from d->share_modes. Modifies d->num_share_modes, watch out in
* routines iterating over that array.
*/
bool share_mode_stale_pid(struct share_mode_data *d, unsigned i)
{
struct share_mode_entry *e;
if (i > d->num_share_modes) {
DEBUG(1, ("Asking for index %u, only %u around\n",
i, (unsigned)d->num_share_modes));
return false;
}
e = &d->share_modes[i];
if (serverid_exists(&e->pid)) {
DEBUG(10, ("PID %s (index %u out of %u) still exists\n",
procid_str_static(&e->pid), i,
(unsigned)d->num_share_modes));
return false;
}
DEBUG(10, ("PID %s (index %u out of %u) does not exist anymore\n",
procid_str_static(&e->pid), i,
(unsigned)d->num_share_modes));
*e = d->share_modes[d->num_share_modes-1];
d->num_share_modes -= 1;
d->modified = true;
return true;
}
/*******************************************************************
Fill a share mode entry.
********************************************************************/

1
source3/locking/proto.h
View File

@ -168,6 +168,7 @@ void get_file_infos(struct file_id id,
struct timespec *write_time);
bool is_valid_share_mode_entry(const struct share_mode_entry *e);
bool is_deferred_open_entry(const struct share_mode_entry *e);
bool share_mode_stale_pid(struct share_mode_data *d, unsigned i);
void set_share_mode(struct share_mode_lock *lck, files_struct *fsp,
uid_t uid, uint64_t mid, uint16 op_type);
void add_deferred_open(struct share_mode_lock *lck, uint64_t mid,