[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1260-g88102b5

[Michael Adam]

The branch, v3-2-test has been updated
       via  88102b5b7c4eaad5445e9cb96e547dd918abc0c2 (commit)
      from  7a88cd61e09f6db9db38916704ae65e03b33139c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 88102b5b7c4eaad5445e9cb96e547dd918abc0c2
Author: Michael Adam <[EMAIL PROTECTED]>
Date:   Thu Jan 10 23:40:13 2008 +0100

    Fix the build of the cacheprime VFS module after API changes.
    
    Sorry, that had escaped my attention.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/modules/vfs_cacheprime.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_cacheprime.c b/source/modules/vfs_cacheprime.c
index 4ac7843..5675108 100644
--- a/source/modules/vfs_cacheprime.c
+++ b/source/modules/vfs_cacheprime.c
@@ -142,16 +142,15 @@ static ssize_t cprime_sendfile(
 static ssize_t cprime_read(
                 vfs_handle_struct * handle,
                 files_struct *      fsp,
-                int                 fd,
                 void *              data,
                 size_t              count)
 {
         SMB_OFF_T offset;
 
-        offset = SMB_VFS_LSEEK(fsp, fd, 0, SEEK_CUR);
+        offset = SMB_VFS_LSEEK(fsp, 0, SEEK_CUR);
         if (offset >= 0 && g_readbuf)  {
-                prime_cache(handle, fsp, fd, offset, count);
-                SMB_VFS_LSEEK(fsp, fd, offset, SEEK_SET);
+                prime_cache(handle, fsp, fsp->fh->fd, offset, count);
+                SMB_VFS_LSEEK(fsp, offset, SEEK_SET);
         }
 
         return SMB_VFS_NEXT_READ(handle, fsp, data, count);


-- 
Samba Shared Repository