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/include | |
| 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/include')
| -rw-r--r-- | source3/include/vfs.h | 6 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 1bea0b8df0..72fab522a2 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -656,8 +656,7 @@ struct vfs_fn_pointers { NTSTATUS (*brl_lock_windows_fn)(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); bool (*brl_unlock_windows_fn)(struct vfs_handle_struct *handle, struct messaging_context *msg_ctx, @@ -1077,8 +1076,7 @@ const char *smb_vfs_call_connectpath(struct vfs_handle_struct *handle, NTSTATUS smb_vfs_call_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); bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle, struct messaging_context *msg_ctx, struct byte_range_lock *br_lck, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 0f44c62dac..775befb495 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -364,10 +364,10 @@ #define SMB_VFS_NEXT_CONNECTPATH(conn, fname) \ smb_vfs_call_connectpath((conn)->next, (fname)) -#define SMB_VFS_BRL_LOCK_WINDOWS(conn, br_lck, plock, blocking_lock, blr) \ - smb_vfs_call_brl_lock_windows((conn)->vfs_handles, (br_lck), (plock), (blocking_lock), (blr)) -#define SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock, blocking_lock, blr) \ - smb_vfs_call_brl_lock_windows((handle)->next, (br_lck), (plock), (blocking_lock), (blr)) +#define SMB_VFS_BRL_LOCK_WINDOWS(conn, br_lck, plock, blocking_lock) \ + smb_vfs_call_brl_lock_windows((conn)->vfs_handles, (br_lck), (plock), (blocking_lock)) +#define SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock, blocking_lock) \ + smb_vfs_call_brl_lock_windows((handle)->next, (br_lck), (plock), (blocking_lock)) #define SMB_VFS_BRL_UNLOCK_WINDOWS(conn, msg_ctx, br_lck, plock) \ smb_vfs_call_brl_unlock_windows((conn)->vfs_handles, (msg_ctx), (br_lck), (plock)) |