diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-02-03 11:56:35 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-02-09 23:47:45 -0800 |
| commit | c6f1f055fdeee29ad7c5b2ae9909e8f1b1a7daec (patch) | |
| tree | 1fc919526e3c6988ede50457ad72b098d42c1be9 /source3/smbd/fileio.c | |
| parent | 9c1310fa6ae1a67dc0fea3bf549d805ff167e78f (diff) | |
| download | samba-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/smbd/fileio.c')
| -rw-r--r-- | source3/smbd/fileio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 3e3f0943b3..a9a97a2d14 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -318,7 +318,9 @@ ssize_t write_file(struct smb_request *req, * the shared memory area whilst doing this. */ - release_level_2_oplocks_on_change(fsp); + /* This should actually be improved to span the write. */ + contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_WRITE); + contend_level2_oplocks_end(fsp, LEVEL2_CONTEND_WRITE); #ifdef WITH_PROFILE if (profile_p && profile_p->writecache_total_writes % 500 == 0) { |