diff options
| author | Jeremy Allison <jra@samba.org> | 2004-12-09 01:07:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:34 -0500 |
| commit | 695188cc262c08807760670c2b6d8c70deda2cdc (patch) | |
| tree | 0b456656dc0d78dd708977b21a2491c88b918220 /source3/locking | |
| parent | c7385a29d899a57617305466b43121f6510382bf (diff) | |
| download | samba-695188cc262c08807760670c2b6d8c70deda2cdc.tar.gz samba-695188cc262c08807760670c2b6d8c70deda2cdc.tar.bz2 samba-695188cc262c08807760670c2b6d8c70deda2cdc.zip | |
r4108: As check_self is *always* False in every invokation, remove the
logic for it. We still pass Samba4 RAW-LOCK test.
Jeremy.
(This used to be commit 596f23051363f8cc8896119b3eca0663a61a38c3)
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 17 | ||||
| -rw-r--r-- | source3/locking/locking.c | 7 |
2 files changed, 8 insertions, 16 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index d92027e267..3451b0cc1a 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -592,7 +592,7 @@ BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, int fnum, BOOL brl_locktest(SMB_DEV_T dev, SMB_INO_T ino, int fnum, uint16 smbpid, pid_t pid, uint16 tid, br_off start, br_off size, - enum brl_type lock_type, int check_self) + enum brl_type lock_type) { TDB_DATA kbuf, dbuf; int count, i; @@ -617,16 +617,11 @@ BOOL brl_locktest(SMB_DEV_T dev, SMB_INO_T ino, int fnum, locks = (struct lock_struct *)dbuf.dptr; count = dbuf.dsize / sizeof(*locks); for (i=0; i<count; i++) { - if (check_self) { - if (brl_conflict(&locks[i], &lock)) - goto fail; - } else { - /* - * Our own locks don't conflict. - */ - if (brl_conflict_other(&locks[i], &lock)) - goto fail; - } + /* + * Our own locks don't conflict. + */ + if (brl_conflict_other(&locks[i], &lock)) + goto fail; } } diff --git a/source3/locking/locking.c b/source3/locking/locking.c index b2f30a5684..b6e2ced336 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -62,14 +62,11 @@ static const char *lock_type_name(enum brl_type lock_type) /**************************************************************************** Utility function called to see if a file region is locked. - If check_self is True, then checks on our own fd with the same locking context - are still made. If check_self is False, then checks are not made on our own fd - with the same locking context are not made. ****************************************************************************/ BOOL is_locked(files_struct *fsp,connection_struct *conn, SMB_BIG_UINT count,SMB_BIG_UINT offset, - enum brl_type lock_type, BOOL check_self) + enum brl_type lock_type) { int snum = SNUM(conn); BOOL ret; @@ -82,7 +79,7 @@ BOOL is_locked(files_struct *fsp,connection_struct *conn, ret = !brl_locktest(fsp->dev, fsp->inode, fsp->fnum, global_smbpid, sys_getpid(), conn->cnum, - offset, count, lock_type, check_self); + offset, count, lock_type); DEBUG(10,("is_locked: brl start=%.0f len=%.0f %s for file %s\n", (double)offset, (double)count, ret ? "locked" : "unlocked", |