summaryrefslogtreecommitdiff
path: root/source3/locking/locking.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-04-11 19:44:54 +0000
committerJeremy Allison <jra@samba.org>2000-04-11 19:44:54 +0000
commitf6be38cae223f1ad3f4ecc5b81d14c44d92f58ba (patch)
treefdfba0ada6fb79f89c27ace70eea7913e9d97915 /source3/locking/locking.c
parentca085145a9392c229b483ee24c1d566a23335fb3 (diff)
downloadsamba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.tar.gz
samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.tar.bz2
samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.zip
include/byteorder.h: ALIGN4/ALIGN2 macros.
include/includes.h: Added SMB_BIG_UINT_BITS. lib/util.c: Removed align2/align4 - use macros. libsmb/namequery.c: Use ALIGN2. locking/locking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T. Needed to move to hiding POSIX locks at a lower layer. nmbd/nmbd_processlogon.c: Use ALIGN2/ALIGN4 macros. smbd/blocking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T. smbd/reply.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T. Jeremy. (This used to be commit 491eea8a20bf80d426625479326211dc975857a6)
Diffstat (limited to 'source3/locking/locking.c')
-rw-r--r--source3/locking/locking.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 45d414daf1..1bb0a3b59c 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -57,7 +57,7 @@ void locking_close_file(files_struct *fsp)
Utility function called to see if a file region is locked.
****************************************************************************/
BOOL is_locked(files_struct *fsp,connection_struct *conn,
- SMB_OFF_T count,SMB_OFF_T offset,
+ SMB_BIG_UINT count,SMB_BIG_UINT offset,
enum brl_type lock_type)
{
int snum = SNUM(conn);
@@ -78,7 +78,7 @@ BOOL is_locked(files_struct *fsp,connection_struct *conn,
Utility function called by locking requests.
****************************************************************************/
BOOL do_lock(files_struct *fsp,connection_struct *conn,
- SMB_OFF_T count,SMB_OFF_T offset,enum brl_type lock_type,
+ SMB_BIG_UINT count,SMB_BIG_UINT offset,enum brl_type lock_type,
int *eclass,uint32 *ecode)
{
BOOL ok = False;
@@ -115,7 +115,7 @@ BOOL do_lock(files_struct *fsp,connection_struct *conn,
Utility function called by unlocking requests.
****************************************************************************/
BOOL do_unlock(files_struct *fsp,connection_struct *conn,
- SMB_OFF_T count,SMB_OFF_T offset,
+ SMB_BIG_UINT count,SMB_BIG_UINT offset,
int *eclass,uint32 *ecode)
{
BOOL ok = False;