summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-10-03 18:11:12 +0000
committerJeremy Allison <jra@samba.org>2002-10-03 18:11:12 +0000
commit1252fda04fa21653d963f830276a3b3669762081 (patch)
treeef94659c16c4b26d7c1f9765b0feadbd0146d482
parent49cd711d49a321de8eeb9ab3720c1357089059b8 (diff)
downloadsamba-1252fda04fa21653d963f830276a3b3669762081.tar.gz
samba-1252fda04fa21653d963f830276a3b3669762081.tar.bz2
samba-1252fda04fa21653d963f830276a3b3669762081.zip
Write cache bugfix from Rasmus Borup Hansen, system adm. Email: rbh@math.ku.dk
Jeremy. (This used to be commit 971b82beb7b99a3ae692ca147cce9ce4b5bce39c)
-rw-r--r--source3/smbd/fileio.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 89f05092b4..a29336d3a2 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -440,6 +440,19 @@ len = %u\n",fsp->fd, (double)pos, (unsigned int)n, (double)wcp->offset, (unsigne
} else {
ssize_t ret = real_write_file(fsp, data, pos, n);
+ /*
+ * If the write overlaps the entire cache, then
+ * discard the current contents of the cache.
+ * Fix from Rasmus Borup Hansen rbh@math.ku.dk.
+ */
+
+ if ((pos <= wcp->offset) &&
+ (pos + n >= wcp->offset + wcp->data_size) ) {
+ DEBUG(9,("write_file: discarding overwritten write \
+cache: fd = %d, off=%.0f, size=%u\n", fsp->fd, (double)wcp->offset, (unsigned int)wcp->data_size ));
+ wcp->data_size = 0;
+ }
+
DO_PROFILE_INC(writecache_direct_writes);
if (ret == -1)
return ret;