summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorRichard Sharpe <realrichardsharpe@gmail.com>2011-12-03 20:45:04 -0800
committerRichard Sharpe <sharpe@samba.org>2011-12-12 04:58:40 +0100
commit422494a8e630e2ca89386344eaa5346388698a32 (patch)
tree1757dd5f7258eae8d413f1e57f72bd3b533d86c7 /source3/locking
parentf452add2231906742c9fd119371cd4fd81a1bdd6 (diff)
downloadsamba-422494a8e630e2ca89386344eaa5346388698a32.tar.gz
samba-422494a8e630e2ca89386344eaa5346388698a32.tar.bz2
samba-422494a8e630e2ca89386344eaa5346388698a32.zip
vfs: Make function pointer names consistent. They all end in _fn
Autobuild-User: Richard Sharpe <sharpe@samba.org> Autobuild-Date: Mon Dec 12 04:58:40 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/brlock.c9
-rw-r--r--source3/locking/posix.c5
2 files changed, 8 insertions, 6 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 2cb2652791..efc58c3891 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -898,8 +898,8 @@ NTSTATUS smb_vfs_call_brl_lock_windows(struct vfs_handle_struct *handle,
struct blocking_lock_record *blr)
{
VFS_FIND(brl_lock_windows);
- return handle->fns->brl_lock_windows(handle, br_lck, plock,
- blocking_lock, blr);
+ return handle->fns->brl_lock_windows_fn(handle, br_lck, plock,
+ blocking_lock, blr);
}
/****************************************************************************
@@ -1232,7 +1232,8 @@ bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle,
const struct lock_struct *plock)
{
VFS_FIND(brl_unlock_windows);
- return handle->fns->brl_unlock_windows(handle, msg_ctx, br_lck, plock);
+ return handle->fns->brl_unlock_windows_fn(handle, msg_ctx, br_lck,
+ plock);
}
/****************************************************************************
@@ -1400,7 +1401,7 @@ bool smb_vfs_call_brl_cancel_windows(struct vfs_handle_struct *handle,
struct blocking_lock_record *blr)
{
VFS_FIND(brl_cancel_windows);
- return handle->fns->brl_cancel_windows(handle, br_lck, plock, blr);
+ return handle->fns->brl_cancel_windows_fn(handle, br_lck, plock, blr);
}
/****************************************************************************
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 0ff2395d60..abedd5600d 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -187,7 +187,7 @@ bool smb_vfs_call_lock(struct vfs_handle_struct *handle,
SMB_OFF_T count, int type)
{
VFS_FIND(lock);
- return handle->fns->lock(handle, fsp, op, offset, count, type);
+ return handle->fns->lock_fn(handle, fsp, op, offset, count, type);
}
/****************************************************************************
@@ -238,7 +238,8 @@ bool smb_vfs_call_getlock(struct vfs_handle_struct *handle,
SMB_OFF_T *pcount, int *ptype, pid_t *ppid)
{
VFS_FIND(getlock);
- return handle->fns->getlock(handle, fsp, poffset, pcount, ptype, ppid);
+ return handle->fns->getlock_fn(handle, fsp, poffset, pcount, ptype,
+ ppid);
}
/****************************************************************************