r6673: Fix the write cache based on some VERY good detective work
authorJeremy Allison <jra@samba.org>
Sun, 8 May 2005 23:16:28 +0000 (23:16 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 15:56:50 +0000 (10:56 -0500)
from Ingo Kilian <ikilian@web.de>.
You must do a make clean after updating this.
Jeremy.

source/include/smb.h
source/printing/printfsp.c
source/smbd/fake_file.c
source/smbd/fileio.c
source/smbd/open.c
source/smbd/reply.c

index f96d79fd06367fea4485e64b73ac2c53932b7bf2..41aaa317fd56d180cdd2cd0490da3be447e97752 100644 (file)
@@ -418,7 +418,6 @@ typedef struct files_struct {
        SMB_INO_T inode;
        BOOL delete_on_close;
        SMB_OFF_T pos;
-       SMB_BIG_UINT size;
        SMB_BIG_UINT initial_allocation_size; /* Faked up initial allocation on disk. */
        SMB_BIG_UINT position_information;
        mode_t mode;
index 25f4d9bd464165b1bfb1f4be36ceddd87cc5e919..863de9624e795a4c75ff4ffc141cdcc2f30f106d 100644 (file)
@@ -66,7 +66,6 @@ files_struct *print_fsp_open(connection_struct *conn, char *fname)
        fsp->fd = print_job_fd(lp_const_servicename(SNUM(conn)),jobid);
        GetTimeOfDay(&fsp->open_time);
        fsp->vuid = current_user.vuid;
-       fsp->size = 0;
        fsp->pos = -1;
        fsp->can_lock = True;
        fsp->can_read = False;
index ee510eb003f2add7a970cece65e0836a20868f9a..59ddb60db5ee00cecbff19dd5bef48e22c17a39a 100644 (file)
@@ -65,7 +65,6 @@ files_struct *open_fake_file_shared1(enum FAKE_FILE_TYPE fake_file_type, connect
        fsp->inode = psbuf->st_ino;
        fsp->dev = psbuf->st_dev;
        fsp->vuid = current_user.vuid;
-       fsp->size = psbuf->st_size;
        fsp->pos = -1;
        fsp->can_lock = True;
        fsp->can_read = ((flags & O_WRONLY)==0);
index 3048c27fa25ee967de23ac2efdb6a2c6168a5017..dbf1e5a789d0026c473b9c79fb49d12c15d97bca 100644 (file)
@@ -28,16 +28,17 @@ static BOOL setup_write_cache(files_struct *, SMB_OFF_T);
  Read from write cache if we can.
 ****************************************************************************/
 
-
 static BOOL read_from_write_cache(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n)
 {
        write_cache *wcp = fsp->wcp;
 
-       if(!wcp)
+       if(!wcp) {
                return False;
+       }
 
-       if(n > wcp->data_size || pos < wcp->offset || pos + n > wcp->offset + wcp->data_size)
+       if( n > wcp->data_size || pos < wcp->offset || pos + n > wcp->offset + wcp->data_size) {
                return False;
+       }
 
        memcpy(data, wcp->data + (pos - wcp->offset), n);
 
@@ -55,8 +56,9 @@ ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n)
        ssize_t ret=0,readret;
 
        /* you can't read from print files */
-       if (fsp->print_file)
+       if (fsp->print_file) {
                return -1;
+       }
 
        /*
         * Serve from write cache if we can.
@@ -90,11 +92,13 @@ tryagain:
 #else /* NO DMF fix. */
                readret = SMB_VFS_PREAD(fsp,fsp->fd,data,n,pos);
 
-               if (readret == -1)
+               if (readret == -1) {
                        return -1;
+               }
 #endif
-               if (readret > 0)
+               if (readret > 0) {
                        ret += readret;
+               }
        }
 
        DEBUG(10,("read_file (%s): pos = %.0f, size = %lu, returned %lu\n",
@@ -117,9 +121,9 @@ static ssize_t real_write_file(files_struct *fsp,char *data,SMB_OFF_T pos, size_
 {
        ssize_t ret;
 
-        if (pos == -1)
+        if (pos == -1) {
                 ret = vfs_write_data(fsp, data, n);
-        else {
+        else {
                fsp->pos = pos;
                 ret = vfs_pwrite_data(fsp, data, n, pos);
        }
@@ -161,7 +165,26 @@ static ssize_t real_write_file(files_struct *fsp,char *data,SMB_OFF_T pos, size_
 }
 
 /****************************************************************************
-write to a file
+ File size cache change.
+ Updates size on disk but doesn't flush the cache.
+****************************************************************************/
+
+static int wcp_file_size_change(files_struct *fsp)
+{
+       int ret;
+       write_cache *wcp = fsp->wcp;
+
+       wcp->file_size = wcp->offset + wcp->data_size;
+       ret = SMB_VFS_FTRUNCATE(fsp, fsp->fd, wcp->file_size);
+       if (ret == -1) {
+               DEBUG(0,("wcp_file_size_change (%s): ftruncate of size %.0f error %s\n",
+                       fsp->fsp_name, (double)wcp->file_size, strerror(errno) ));
+       }
+       return ret;
+}
+
+/****************************************************************************
+ Write to a file.
 ****************************************************************************/
 
 ssize_t write_file(files_struct *fsp, char *data, SMB_OFF_T pos, size_t n)
@@ -195,7 +218,6 @@ ssize_t write_file(files_struct *fsp, char *data, SMB_OFF_T pos, size_t n)
 
                if (SMB_VFS_FSTAT(fsp,fsp->fd,&st) == 0) {
                        int dosmode = dos_mode(fsp->conn,fsp->fsp_name,&st);
-                       fsp->size = (SMB_BIG_UINT)st.st_size;
                        if ((lp_store_dos_attributes(SNUM(fsp->conn)) || MAP_ARCHIVE(fsp->conn)) && !IS_DOS_ARCHIVE(dosmode)) {
                                file_set_dosmode(fsp->conn,fsp->fsp_name,dosmode | aARCH,&st, False);
                        }
@@ -257,8 +279,6 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
        if(!wcp) {
                DO_PROFILE_INC(writecache_direct_writes);
                total_written = real_write_file(fsp, data, pos, n);
-               if ((total_written != -1) && (pos + total_written > (SMB_OFF_T)fsp->size)) 
-                       fsp->size = (SMB_BIG_UINT)(pos + total_written);
                return total_written;
        }
 
@@ -273,7 +293,6 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
         */
 
        if (wcp->data_size) {
-
                BOOL cache_flush_needed = False;
 
                if ((pos >= wcp->offset) && (pos <= wcp->offset + wcp->data_size)) {
@@ -302,16 +321,18 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
                         * Update the current buffer size with the new data.
                         */
 
-                       if(pos + data_used > wcp->offset + wcp->data_size)
+                       if(pos + data_used > wcp->offset + wcp->data_size) {
                                wcp->data_size = pos + data_used - wcp->offset;
+                       }
 
                        /*
                         * Update the file size if changed.
                         */
 
                        if (wcp->offset + wcp->data_size > wcp->file_size) {
-                               wcp->file_size = wcp->offset + wcp->data_size;
-                               fsp->size = (SMB_BIG_UINT)wcp->file_size;
+                               if (wcp_file_size_change(fsp) == -1) {
+                                       return -1;
+                               }
                        }
 
                        /*
@@ -319,11 +340,11 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
                         * return here.
                         */
 
-                       if(n == data_used)
+                       if(n == data_used) {
                                return n;
-                       else
+                       } else {
                                cache_flush_needed = True;
-
+                       }
                        /*
                         * Move the start of data forward by the amount used,
                         * cut down the amount left by the same amount.
@@ -365,16 +386,18 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
                         * Update the current buffer size with the new data.
                         */
 
-                       if(pos + n > wcp->offset + wcp->data_size)
+                       if(pos + n > wcp->offset + wcp->data_size) {
                                wcp->data_size = pos + n - wcp->offset;
+                       }
 
                        /*
                         * Update the file size if changed.
                         */
 
                        if (wcp->offset + wcp->data_size > wcp->file_size) {
-                               wcp->file_size = wcp->offset + wcp->data_size;
-                               fsp->size = (SMB_BIG_UINT)wcp->file_size;
+                               if (wcp_file_size_change(fsp) == -1) {
+                                       return -1;
+                               }
                        }
 
                        /*
@@ -423,10 +446,11 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
 
                        size_t data_used;
 
-                       if(pos + n <= wcp->offset + wcp->alloc_size)
+                       if(pos + n <= wcp->offset + wcp->alloc_size) {
                                data_used = n;
-                       else
+                       } else {
                                data_used = wcp->offset + wcp->alloc_size - pos;
+                       }
 
                        /*
                         * Fill in the non-continuous area with zeros.
@@ -441,16 +465,18 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
                         * Update the current buffer size with the new data.
                         */
 
-                       if(pos + data_used > wcp->offset + wcp->data_size)
+                       if(pos + data_used > wcp->offset + wcp->data_size) {
                                wcp->data_size = pos + data_used - wcp->offset;
+                       }
 
                        /*
                         * Update the file size if changed.
                         */
 
                        if (wcp->offset + wcp->data_size > wcp->file_size) {
-                               wcp->file_size = wcp->offset + wcp->data_size;
-                               fsp->size = (SMB_BIG_UINT)wcp->file_size;
+                               if (wcp_file_size_change(fsp) == -1) {
+                                       return -1;
+                               }
                        }
 
                        /*
@@ -458,10 +484,11 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
                         * return here.
                         */
 
-                       if(n == data_used)
+                       if(n == data_used) {
                                return n;
-                       else
+                       } else {
                                cache_flush_needed = True;
+                       }
 
                        /*
                         * Move the start of data forward by the amount used,
@@ -521,15 +548,6 @@ nonop=%u allocated=%u active=%u direct=%u perfect=%u readhits=%u\n",
                        DEBUG(9,("write_file: non cacheable write : fd = %d, pos = %.0f, len = %u, current cache pos = %.0f \
 len = %u\n",fsp->fd, (double)pos, (unsigned int)n, (double)wcp->offset, (unsigned int)wcp->data_size ));
 
-                       /*
-                        * Update the file size if needed.
-                        */
-
-                       if(pos + n > wcp->file_size) {
-                               wcp->file_size = pos + n;
-                               fsp->size = (SMB_BIG_UINT)wcp->file_size;
-                       }
-
                        /*
                         * If write would fit in the cache, and is larger than
                         * the data already in the cache, flush the cache and
@@ -556,12 +574,12 @@ cache: fd = %d, off=%.0f, size=%u\n", fsp->fd, (double)wcp->offset, (unsigned in
                                }
 
                                DO_PROFILE_INC(writecache_direct_writes);
-                               if (ret == -1)
+                               if (ret == -1) {
                                        return ret;
+                               }
 
                                if (pos + ret > wcp->file_size) {
                                        wcp->file_size = pos + ret;
-                                       fsp->size = (SMB_BIG_UINT)wcp->file_size;
                                }
 
                                return ret;
@@ -571,11 +589,6 @@ cache: fd = %d, off=%.0f, size=%u\n", fsp->fd, (double)wcp->offset, (unsigned in
 
                }
 
-               if(wcp->data_size > wcp->file_size) {
-                       wcp->file_size = wcp->data_size;
-                       fsp->size = (SMB_BIG_UINT)wcp->file_size;
-               }
-
                if (cache_flush_needed) {
                        DEBUG(3,("WRITE_FLUSH:%d: due to noncontinuous write: fd = %d, size = %.0f, pos = %.0f, \
 n = %u, wcp->offset=%.0f, wcp->data_size=%u\n",
@@ -593,12 +606,12 @@ n = %u, wcp->offset=%.0f, wcp->data_size=%u\n",
 
        if (n > wcp->alloc_size ) {
                ssize_t ret = real_write_file(fsp, data, pos, n);
-               if (ret == -1)
+               if (ret == -1) {
                        return -1;
+               }
 
                if (pos + ret > wcp->file_size) {
                        wcp->file_size = pos + n;
-                       fsp->size = (SMB_BIG_UINT)wcp->file_size;
                }
 
                DO_PROFILE_INC(writecache_direct_writes);
@@ -629,8 +642,9 @@ n = %u, wcp->offset=%.0f, wcp->data_size=%u\n",
                 */
 
                if (wcp->offset + wcp->data_size > wcp->file_size) {
-                       wcp->file_size = wcp->offset + wcp->data_size;
-                       fsp->size = (SMB_BIG_UINT)wcp->file_size;
+                       if (wcp_file_size_change(fsp) == -1) {
+                               return -1;
+                       }
                }
                DEBUG(9,("wcp->offset = %.0f wcp->data_size = %u cache return %u\n",
                        (double)wcp->offset, (unsigned int)wcp->data_size, (unsigned int)n));
@@ -650,11 +664,13 @@ void delete_write_cache(files_struct *fsp)
 {
        write_cache *wcp;
 
-       if(!fsp)
+       if(!fsp) {
                return;
+       }
 
-       if(!(wcp = fsp->wcp))
+       if(!(wcp = fsp->wcp)) {
                return;
+       }
 
        DO_PROFILE_DEC(writecache_allocated_write_caches);
        allocated_write_caches--;
@@ -676,11 +692,13 @@ static BOOL setup_write_cache(files_struct *fsp, SMB_OFF_T file_size)
        ssize_t alloc_size = lp_write_cache_size(SNUM(fsp->conn));
        write_cache *wcp;
 
-       if (allocated_write_caches >= MAX_WRITE_CACHES) 
+       if (allocated_write_caches >= MAX_WRITE_CACHES) {
                return False;
+       }
 
-       if(alloc_size == 0 || fsp->wcp)
+       if(alloc_size == 0 || fsp->wcp) {
                return False;
+       }
 
        if((wcp = SMB_MALLOC_P(write_cache)) == NULL) {
                DEBUG(0,("setup_write_cache: malloc fail.\n"));
@@ -716,7 +734,6 @@ static BOOL setup_write_cache(files_struct *fsp, SMB_OFF_T file_size)
 
 void set_filelen_write_cache(files_struct *fsp, SMB_OFF_T file_size)
 {
-       fsp->size = (SMB_BIG_UINT)file_size;
        if(fsp->wcp) {
                /* The cache *must* have been flushed before we do this. */
                if (fsp->wcp->data_size != 0) {
@@ -739,8 +756,9 @@ ssize_t flush_write_cache(files_struct *fsp, enum flush_reason_enum reason)
        size_t data_size;
        ssize_t ret;
 
-       if(!wcp || !wcp->data_size)
+       if(!wcp || !wcp->data_size) {
                return 0;
+       }
 
        data_size = wcp->data_size;
        wcp->data_size = 0;
@@ -751,8 +769,9 @@ ssize_t flush_write_cache(files_struct *fsp, enum flush_reason_enum reason)
                fsp->fd, (double)wcp->offset, (unsigned int)data_size));
 
 #ifdef WITH_PROFILE
-       if(data_size == wcp->alloc_size)
+       if(data_size == wcp->alloc_size) {
                DO_PROFILE_INC(writecache_num_perfect_writes);
+       }
 #endif
 
        ret = real_write_file(fsp, wcp->data, wcp->offset, data_size);
@@ -761,8 +780,9 @@ ssize_t flush_write_cache(files_struct *fsp, enum flush_reason_enum reason)
         * Ensure file size if kept up to date if write extends file.
         */
 
-       if ((ret != -1) && (wcp->offset + ret > wcp->file_size))
+       if ((ret != -1) && (wcp->offset + ret > wcp->file_size)) {
                wcp->file_size = wcp->offset + ret;
+       }
 
        return ret;
 }
@@ -786,8 +806,9 @@ void sync_file(connection_struct *conn, files_struct *fsp)
 
 int fsp_stat(files_struct *fsp, SMB_STRUCT_STAT *pst)
 {
-       if (fsp->fd == -1)
+       if (fsp->fd == -1) {
                return SMB_VFS_STAT(fsp->conn, fsp->fsp_name, pst);
-       else
+       } else {
                return SMB_VFS_FSTAT(fsp,fsp->fd, pst);
+       }
 }
index a3bc4a922d34abe8059648fc1a6c6e9bffc8ea78..8b30776fdd6d35d2fb7893f35d9c51e8f65fbe69 100644 (file)
@@ -304,7 +304,6 @@ static BOOL open_file(files_struct *fsp,connection_struct *conn,
        fsp->dev = psbuf->st_dev;
        fsp->vuid = current_user.vuid;
        fsp->file_pid = global_smbpid;
-       fsp->size = psbuf->st_size;
        fsp->can_lock = True;
        fsp->can_read = ((flags & O_WRONLY)==0);
        fsp->can_write = ((flags & (O_WRONLY|O_RDWR))!=0);
@@ -1701,7 +1700,6 @@ files_struct *open_directory(connection_struct *conn, const char *fname, SMB_STR
        fsp->mode = psbuf->st_mode;
        fsp->inode = psbuf->st_ino;
        fsp->dev = psbuf->st_dev;
-       fsp->size = psbuf->st_size;
        fsp->vuid = current_user.vuid;
        fsp->file_pid = global_smbpid;
        fsp->can_lock = True;
@@ -1765,7 +1763,6 @@ files_struct *open_file_stat(connection_struct *conn, char *fname, SMB_STRUCT_ST
        fsp->mode = psbuf->st_mode;
        fsp->inode = psbuf->st_ino;
        fsp->dev = psbuf->st_dev;
-       fsp->size = psbuf->st_size;
        fsp->vuid = current_user.vuid;
        fsp->file_pid = global_smbpid;
        fsp->can_lock = False;
index e1131c56ed59bc5c478b202b0878ac03bba5dd4c..686f54c5e714c8b6f4a19cee3b0a4d069855a011 100644 (file)
@@ -2190,21 +2190,18 @@ int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_s
        maxcount = MIN(65535,maxcount);
 
        if (!is_locked(fsp,conn,(SMB_BIG_UINT)maxcount,(SMB_BIG_UINT)startpos, READ_LOCK)) {
-               SMB_OFF_T size = fsp->size;
-               SMB_OFF_T sizeneeded = startpos + maxcount;
+               SMB_STRUCT_STAT st;
+               SMB_OFF_T size = 0;
   
-               if (size < sizeneeded) {
-                       SMB_STRUCT_STAT st;
-                       if (SMB_VFS_FSTAT(fsp,fsp->fd,&st) == 0)
-                               size = st.st_size;
-                       if (!fsp->can_write) 
-                               fsp->size = size;
+               if (SMB_VFS_FSTAT(fsp,fsp->fd,&st) == 0) {
+                       size = st.st_size;
                }
 
-               if (startpos >= size)
+               if (startpos >= size) {
                        nread = 0;
-               else
+               } else {
                        nread = MIN(maxcount,(size - startpos));          
+               }
        }
 
 #if 0 /* mincount appears to be ignored in a W2K server. JRA. */