summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-27 15:23:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:23 -0500
commit54cdd1dfe23219c3cc9c772b78fbd40e144957c6 (patch)
tree87dc452d202208809ed1db9a4e550c76b1315e61
parent9bfa22a502df998c0a813d33907347fc5d0dc827 (diff)
downloadsamba-54cdd1dfe23219c3cc9c772b78fbd40e144957c6.tar.gz
samba-54cdd1dfe23219c3cc9c772b78fbd40e144957c6.tar.bz2
samba-54cdd1dfe23219c3cc9c772b78fbd40e144957c6.zip
r17276: Don't change the POSIX lock ref count if posix locking = no.
Jeremy. (This used to be commit 42dec2192c1261090f2fac7a123c384f5c133587)
-rw-r--r--source3/locking/brlock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 07e4b4c16b..5ce8a3730b 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1326,8 +1326,8 @@ void brl_close_fnum(struct byte_range_lock *br_lck)
}
}
- if (num_deleted_windows_locks) {
- /* Reduce the Windows lock reference count on this dev/ino pair. */
+ if(lp_posix_locking(fsp->conn->cnum) && num_deleted_windows_locks) {
+ /* Reduce the Windows lock POSIX reference count on this dev/ino pair. */
reduce_windows_lock_ref_count(fsp, num_deleted_windows_locks);
}
}