diff options
author | Volker Lendecke <vl@samba.org> | 2014-09-23 05:18:54 +0200 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2014-10-31 03:47:40 +0100 |
commit | 0d4f7bfdb995a239508457cd433bc8001c0e8279 (patch) | |
tree | 311a74140b9c4e59680e54fc422b4d548f559996 | |
parent | c3b00b99449c7d19de81a2b9e1b8ef776e8cbb20 (diff) | |
download | samba-0d4f7bfdb995a239508457cd433bc8001c0e8279.tar.gz samba-0d4f7bfdb995a239508457cd433bc8001c0e8279.tar.xz samba-0d4f7bfdb995a239508457cd433bc8001c0e8279.zip |
s3:locking: Rename share_mode_forall->share_entry_forall
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r-- | source3/locking/proto.h | 4 | ||||
-rw-r--r-- | source3/locking/share_mode_lock.c | 4 | ||||
-rw-r--r-- | source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 8 | ||||
-rw-r--r-- | source3/utils/status.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 46eec2af06..ce8c25cf52 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -190,8 +190,8 @@ bool is_delete_on_close_set(struct share_mode_lock *lck, uint32_t name_hash); bool set_sticky_write_time(struct file_id fileid, struct timespec write_time); bool set_write_time(struct file_id fileid, struct timespec write_time); struct timespec get_share_mode_write_time(struct share_mode_lock *lck); -int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *, - const char *, void *), +int share_entry_forall(void (*fn)(const struct share_mode_entry *, const char *, + const char *, void *), void *private_data); bool share_mode_cleanup_disconnected(struct file_id id, uint64_t open_persistent_id); diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index 12f499b1b9..53039eb81a 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -499,8 +499,8 @@ static int traverse_fn(struct db_record *rec, void *_state) share mode system. ********************************************************************/ -int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *, - const char *, void *), +int share_entry_forall(void (*fn)(const struct share_mode_entry *, + const char *, const char *, void *), void *private_data) { struct forall_state state; diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index 855b8c7fb7..d2f05f30cc 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -166,7 +166,7 @@ static WERROR net_enum_files(TALLOC_CTX *ctx, f_enum_cnt.username = username; f_enum_cnt.ctr3 = *ctr3; - share_mode_forall( enum_file_fn, (void *)&f_enum_cnt ); + share_entry_forall( enum_file_fn, (void *)&f_enum_cnt ); *ctr3 = f_enum_cnt.ctr3; @@ -867,7 +867,7 @@ static void net_count_files_for_all_sess(struct srvsvc_NetSessCtr1 *ctr1, s_file_info.resume_handle = resume_handle; s_file_info.num_entries = num_entries; - share_mode_forall(count_sess_files_fn, &s_file_info); + share_entry_forall(count_sess_files_fn, &s_file_info); } /******************************************************************* @@ -984,7 +984,7 @@ static void count_share_opens(struct srvsvc_NetConnInfo1 *arr, sfs.resp_entries = resp_entries; sfs.total_entries = total_entries; - share_mode_forall(share_file_fn, &sfs); + share_entry_forall(share_file_fn, &sfs); } /**************************************************************************** @@ -2744,7 +2744,7 @@ WERROR _srvsvc_NetFileClose(struct pipes_struct *p, r->out.result = WERR_BADFILE; state.r = r; state.msg_ctx = p->msg_ctx; - share_mode_forall(enum_file_close_fn, &state); + share_entry_forall(enum_file_close_fn, &state); return r->out.result; } diff --git a/source3/utils/status.c b/source3/utils/status.c index 7bbcea5637..2c850bb591 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -526,7 +526,7 @@ int main(int argc, const char *argv[]) goto done; } - result = share_mode_forall(print_share_mode, NULL); + result = share_entry_forall(print_share_mode, NULL); if (result == 0) { d_printf("No locked files\n"); |