summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-02-03 11:56:35 -0800
committerTim Prouty <tprouty@samba.org>2009-02-09 23:47:45 -0800
commitc6f1f055fdeee29ad7c5b2ae9909e8f1b1a7daec (patch)
tree1fc919526e3c6988ede50457ad72b098d42c1be9 /source3/lib
parent9c1310fa6ae1a67dc0fea3bf549d805ff167e78f (diff)
downloadsamba-c6f1f055fdeee29ad7c5b2ae9909e8f1b1a7daec.tar.gz
samba-c6f1f055fdeee29ad7c5b2ae9909e8f1b1a7daec.tar.bz2
samba-c6f1f055fdeee29ad7c5b2ae9909e8f1b1a7daec.zip
s3 oplocks: Make the level2 oplock contention API more granular
This replaces release_level2_oplocks_on_change with contend_level2_oplock_begin/end in order to contend level2 oplocks throughout an operation rather than just at the begining. This is necessary for some kernel oplock implementations, and also lays the groundwork for better correctness in Samba's standard level2 oplock handling. The next step for non-kernel oplocks is to add additional state to the share mode lock struct that prevents any new opens from granting oplocks while a contending operation is in progress. All operations that contend level 2 oplocks are now correctly spanned except for aio and synchronous writes. The two write paths both have non-trivial error paths that need extra care to get right. RAW-OPLOCK and the rest of 'make test' are still passing with this change.
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/dummysmbd.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/source3/lib/dummysmbd.c b/source3/lib/dummysmbd.c
index 5c624bdebf..a41e6dc033 100644
--- a/source3/lib/dummysmbd.c
+++ b/source3/lib/dummysmbd.c
@@ -66,3 +66,22 @@ struct messaging_context *smbd_messaging_context(void)
{
return NULL;
}
+
+/**
+ * The following two functions need to be called from inside the low-level BRL
+ * code for oplocks correctness in smbd. Since other utility binaries also
+ * link in some of the brl code directly, these dummy functions are necessary
+ * to avoid needing to link in the oplocks code and its dependencies to all of
+ * the utility binaries.
+ */
+void contend_level2_oplocks_begin(files_struct *fsp,
+ enum level2_contention_type type)
+{
+ return;
+}
+
+void contend_level2_oplocks_end(files_struct *fsp,
+ enum level2_contention_type type)
+{
+ return;
+}