diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-03 13:51:45 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-07-04 06:31:16 +0200 |
| commit | b08fe2d98d65c4c389ac8771c91d907958490f4f (patch) | |
| tree | b66284acecfba22e5153c03fa62f3c54e274d6a0 /source3/modules | |
| parent | e2233fbcee542ccd9bb45ace8d6ae2f6d783c9a1 (diff) | |
| download | samba-b08fe2d98d65c4c389ac8771c91d907958490f4f.tar.gz samba-b08fe2d98d65c4c389ac8771c91d907958490f4f.tar.xz samba-b08fe2d98d65c4c389ac8771c91d907958490f4f.zip | |
smbd: Remove unused blocking_lock_record* from VFS_BRL_LOCK_WINDOWS
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_default.c | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 5 | ||||
| -rw-r--r-- | source3/modules/vfs_time_audit.c | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 06953573e6..bc47e5a69c 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2205,8 +2205,7 @@ static const char *vfswrap_connectpath(struct vfs_handle_struct *handle, static NTSTATUS vfswrap_brl_lock_windows(struct vfs_handle_struct *handle, struct byte_range_lock *br_lck, struct lock_struct *plock, - bool blocking_lock, - struct blocking_lock_record *blr) + bool blocking_lock) { SMB_ASSERT(plock->lock_flav == WINDOWS_LOCK); diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 99e3fcbb45..33058f4843 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -1650,13 +1650,12 @@ static const char *smb_full_audit_connectpath(vfs_handle_struct *handle, static NTSTATUS smb_full_audit_brl_lock_windows(struct vfs_handle_struct *handle, struct byte_range_lock *br_lck, struct lock_struct *plock, - bool blocking_lock, - struct blocking_lock_record *blr) + bool blocking_lock) { NTSTATUS result; result = SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock, - blocking_lock, blr); + blocking_lock); do_log(SMB_VFS_OP_BRL_LOCK_WINDOWS, NT_STATUS_IS_OK(result), handle, "%s:%llu-%llu. type=%d. blocking=%d", diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c index a70c8cad94..f644ed1709 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -1543,8 +1543,7 @@ static const char *smb_time_audit_connectpath(vfs_handle_struct *handle, static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle, struct byte_range_lock *br_lck, struct lock_struct *plock, - bool blocking_lock, - struct blocking_lock_record *blr) + bool blocking_lock) { NTSTATUS result; struct timespec ts1,ts2; @@ -1552,7 +1551,7 @@ static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle clock_gettime_mono(&ts1); result = SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock, - blocking_lock, blr); + blocking_lock); clock_gettime_mono(&ts2); timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9; |