diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-11-11 17:05:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:46 -0500 |
| commit | b6b84f98c0420f45c498b025d9edbeb7f830205a (patch) | |
| tree | 458be5abc42d9fc7f67f9de0d4e604a910c70e36 /source3/locking/locking.c | |
| parent | 5f3a692748e5927d195e02844e6cbb31540da965 (diff) | |
| download | samba-b6b84f98c0420f45c498b025d9edbeb7f830205a.tar.gz samba-b6b84f98c0420f45c498b025d9edbeb7f830205a.tar.bz2 samba-b6b84f98c0420f45c498b025d9edbeb7f830205a.zip | |
r19668: Convert the locking params to use struct share_param instead of snum
(This used to be commit 609dbec600048718b86cd1ecdc2ce49bbdeb803c)
Diffstat (limited to 'source3/locking/locking.c')
| -rw-r--r-- | source3/locking/locking.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index fbe22f4e1d..13c7724656 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -80,8 +80,7 @@ BOOL is_locked(files_struct *fsp, SMB_BIG_UINT offset, enum brl_type lock_type) { - int snum = SNUM(fsp->conn); - int strict_locking = lp_strict_locking(snum); + int strict_locking = lp_strict_locking(fsp->conn->params); enum brl_flavour lock_flav = lp_posix_cifsu_locktype(); BOOL ret = True; @@ -89,7 +88,7 @@ BOOL is_locked(files_struct *fsp, return False; } - if (!lp_locking(snum) || !strict_locking) { + if (!lp_locking(fsp->conn->params) || !strict_locking) { return False; } @@ -156,7 +155,7 @@ NTSTATUS query_lock(files_struct *fsp, return fsp->is_directory ? NT_STATUS_INVALID_DEVICE_REQUEST : NT_STATUS_INVALID_HANDLE; } - if (!lp_locking(SNUM(fsp->conn))) { + if (!lp_locking(fsp->conn->params)) { return NT_STATUS_OK; } @@ -197,7 +196,7 @@ struct byte_range_lock *do_lock(files_struct *fsp, return NULL; } - if (!lp_locking(SNUM(fsp->conn))) { + if (!lp_locking(fsp->conn->params)) { *perr = NT_STATUS_OK; return NULL; } @@ -243,7 +242,7 @@ NTSTATUS do_unlock(files_struct *fsp, return fsp->is_directory ? NT_STATUS_INVALID_DEVICE_REQUEST : NT_STATUS_INVALID_HANDLE; } - if (!lp_locking(SNUM(fsp->conn))) { + if (!lp_locking(fsp->conn->params)) { return NT_STATUS_OK; } @@ -290,7 +289,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp, NT_STATUS_INVALID_DEVICE_REQUEST : NT_STATUS_INVALID_HANDLE; } - if (!lp_locking(SNUM(fsp->conn))) { + if (!lp_locking(fsp->conn->params)) { return NT_STATUS_DOS(ERRDOS, ERRcancelviolation); } @@ -327,7 +326,7 @@ void locking_close_file(files_struct *fsp) { struct byte_range_lock *br_lck; - if (!lp_locking(SNUM(fsp->conn))) { + if (!lp_locking(fsp->conn->params)) { return; } |