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 | 6f8fd3d5ab206838a70bdcbfc3386dc668676d70 (patch) | |
| tree | e54caa9bd3160e5bd1921ebfccf4e577ca6bcdf9 /source3/include | |
| parent | f038cf739dc5613b10ffbd3c0434c5b729768ad2 (diff) | |
| download | samba-6f8fd3d5ab206838a70bdcbfc3386dc668676d70.tar.gz samba-6f8fd3d5ab206838a70bdcbfc3386dc668676d70.tar.xz samba-6f8fd3d5ab206838a70bdcbfc3386dc668676d70.zip | |
smbd: Remove unused blocking_lock_record* from VFS_BRL_CANCEL_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 72fab522a2..474b1e3a78 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -665,8 +665,7 @@ struct vfs_fn_pointers { bool (*brl_cancel_windows_fn)(struct vfs_handle_struct *handle, struct byte_range_lock *br_lck, - struct lock_struct *plock, - struct blocking_lock_record *blr); + struct lock_struct *plock); bool (*strict_lock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, @@ -1083,8 +1082,7 @@ bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle, const struct lock_struct *plock); bool smb_vfs_call_brl_cancel_windows(struct vfs_handle_struct *handle, struct byte_range_lock *br_lck, - struct lock_struct *plock, - struct blocking_lock_record *blr); + struct lock_struct *plock); bool smb_vfs_call_strict_lock(struct vfs_handle_struct *handle, struct files_struct *fsp, struct lock_struct *plock); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 775befb495..de9f55fda8 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -374,10 +374,10 @@ #define SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, msg_ctx, br_lck, plock) \ smb_vfs_call_brl_unlock_windows((handle)->next, (msg_ctx), (br_lck), (plock)) -#define SMB_VFS_BRL_CANCEL_WINDOWS(conn, br_lck, plock, blr) \ - smb_vfs_call_brl_cancel_windows((conn)->vfs_handles, (br_lck), (plock), (blr)) -#define SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock, blr) \ - smb_vfs_call_brl_cancel_windows((handle)->next, (br_lck), (plock), (blr)) +#define SMB_VFS_BRL_CANCEL_WINDOWS(conn, br_lck, plock) \ + smb_vfs_call_brl_cancel_windows((conn)->vfs_handles, (br_lck), (plock)) +#define SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock) \ + smb_vfs_call_brl_cancel_windows((handle)->next, (br_lck), (plock)) #define SMB_VFS_STRICT_LOCK(conn, fsp, plock) \ smb_vfs_call_strict_lock((conn)->vfs_handles, (fsp), (plock)) |