diff options
Diffstat (limited to 'source3/locking/locking.c')
| -rw-r--r-- | source3/locking/locking.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 4c6d89571e..e10e8a1fa0 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -69,24 +69,31 @@ BOOL is_locked(files_struct *fsp,connection_struct *conn, enum brl_type lock_type) { int snum = SNUM(conn); + int strict_locking = lp_strict_locking(snum); BOOL ret; if (count == 0) return(False); - if (!lp_locking(snum) || !lp_strict_locking(snum)) + if (!lp_locking(snum) || !strict_locking) return(False); - if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && (lock_type == READ_LOCK || lock_type == WRITE_LOCK)) { - DEBUG(10,("is_locked: optimisation - exclusive oplock on file %s\n", fsp->fsp_name )); - ret = 0; - } else if (LEVEL_II_OPLOCK_TYPE(fsp->oplock_type) && (lock_type == READ_LOCK)) { - DEBUG(10,("is_locked: optimisation - level II oplock on file %s\n", fsp->fsp_name )); - ret = 0; + if (strict_locking == Auto) { + if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && (lock_type == READ_LOCK || lock_type == WRITE_LOCK)) { + DEBUG(10,("is_locked: optimisation - exclusive oplock on file %s\n", fsp->fsp_name )); + ret = 0; + } else if (LEVEL_II_OPLOCK_TYPE(fsp->oplock_type) && (lock_type == READ_LOCK)) { + DEBUG(10,("is_locked: optimisation - level II oplock on file %s\n", fsp->fsp_name )); + ret = 0; + } else { + ret = !brl_locktest(fsp->dev, fsp->inode, fsp->fnum, + global_smbpid, sys_getpid(), conn->cnum, + offset, count, lock_type); + } } else { ret = !brl_locktest(fsp->dev, fsp->inode, fsp->fnum, - global_smbpid, sys_getpid(), conn->cnum, - offset, count, lock_type); + global_smbpid, sys_getpid(), conn->cnum, + offset, count, lock_type); } DEBUG(10,("is_locked: brl start=%.0f len=%.0f %s for file %s\n", |