From 695188cc262c08807760670c2b6d8c70deda2cdc Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 9 Dec 2004 01:07:06 +0000
Subject: 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)

---
 source3/locking/brlock.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'source3/locking/brlock.c')

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;
 		}
 	}
 
-- 
cgit