summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-10-03 19:04:46 +0000
committerJeremy Allison <jra@samba.org>2002-10-03 19:04:46 +0000
commita237fb349aba013aec8367d4a1b435b60b0c8458 (patch)
treeed4cde39520bfc3d82e00f55b4d3421491b0ae0d
parent62d14a17da0cef9f5369f5009dc7b229b0af1547 (diff)
downloadsamba-a237fb349aba013aec8367d4a1b435b60b0c8458.tar.gz
samba-a237fb349aba013aec8367d4a1b435b60b0c8458.tar.bz2
samba-a237fb349aba013aec8367d4a1b435b60b0c8458.zip
Added ASCII art to make this clearer.
Jeremy. (This used to be commit 96e9ff905426f4754685a140674934cf2f6cb11c)
-rw-r--r--source3/smbd/fileio.c74
1 files changed, 73 insertions, 1 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index a29336d3a2..d5df9826df 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -256,6 +256,18 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
if ((pos >= wcp->offset) && (pos <= wcp->offset + wcp->data_size)) {
+ /* ASCII art.... JRA.
+
+ +--------------+-----
+ | Cached data | Rest of allocated cache buffer....
+ +--------------+-----
+
+ +-------------------+
+ | Data to write |
+ +-------------------+
+
+ */
+
/*
* Start of write overlaps or abutts the existing data.
*/
@@ -305,6 +317,18 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
} else if ((pos < wcp->offset) && (pos + n > wcp->offset) &&
(pos + n <= wcp->offset + wcp->alloc_size)) {
+ /* ASCII art.... JRA.
+
+ +---------------+
+ | Cache buffer |
+ +---------------+
+
+ +-------------------+
+ | Data to write |
+ +-------------------+
+
+ */
+
/*
* End of write overlaps the existing data.
*/
@@ -350,6 +374,20 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
(pos > wcp->offset + wcp->data_size) &&
(pos < wcp->offset + wcp->alloc_size) ) {
+ /* ASCII art.... JRA.
+
+ End of file ---->|
+
+ +---------------+---------------+
+ | Cached data | Cache buffer |
+ +---------------+---------------+
+
+ +-------------------+
+ | Data to write |
+ +-------------------+
+
+ */
+
/*
* Non-contiguous write part of which fits within
* the cache buffer and is extending the file
@@ -413,7 +451,41 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
} else {
- /*
+ /* ASCII art..... JRA.
+
+ Case 1).
+
+ +---------------+---------------+
+ | Cached data | Cache buffer |
+ +---------------+---------------+
+
+ +-------------------+
+ | Data to write |
+ +-------------------+
+
+ Case 2).
+
+ +---------------+---------------+
+ | Cached data | Cache buffer |
+ +---------------+---------------+
+
+ +-------------------+
+ | Data to write |
+ +-------------------+
+
+ Case 3).
+
+ +---------------+---------------+
+ | Cached data | Cache buffer |
+ +---------------+---------------+
+
+ +-----------------------------------------------------+
+ | Data to write |
+ +-----------------------------------------------------+
+
+ */
+
+ /*
* Write is bigger than buffer, or there is no overlap on the
* low or high ends.
*/