Imported Upstream version 4.0.0+dfsg1

[abartlet/samba-debian.git] / source3 / modules / vfs_cacheprime.c

diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c
index 167b93580f9ea42d8679167bf2cce5900cf4132c..65e63e2b397ee49701a033da541ff10982acaee8 100644 (file)
--- a/source3/modules/vfs_cacheprime.c
+++ b/source3/modules/vfs_cacheprime.c
@@ -49,13 +49,13 @@ static void * g_readbuf = NULL;
 static bool prime_cache(
             struct vfs_handle_struct *  handle,
                        files_struct *                  fsp,
-                       SMB_OFF_T                           offset,
+                       off_t                       offset,
                        size_t                              count)
 {
-        SMB_OFF_T * last;
+        off_t * last;
         ssize_t nread;
 
-        last = (SMB_OFF_T *)VFS_ADD_FSP_EXTENSION(handle, fsp, SMB_OFF_T, NULL);
+        last = (off_t *)VFS_ADD_FSP_EXTENSION(handle, fsp, off_t, NULL);
         if (!last) {
                 return False;
         }
@@ -134,7 +134,7 @@ static ssize_t cprime_sendfile(
                 int                         tofd,
                 files_struct *              fromfsp,
                 const DATA_BLOB *           header,
-                SMB_OFF_T                   offset,
+                off_t                   offset,
                 size_t                      count)
 {
         if (g_readbuf && offset == 0) {
@@ -151,7 +151,7 @@ static ssize_t cprime_read(
                 void *              data,
                 size_t              count)
 {
-        SMB_OFF_T offset;
+        off_t offset;
 
         offset = SMB_VFS_LSEEK(fsp, 0, SEEK_CUR);
         if (offset >= 0 && g_readbuf)  {
@@ -167,7 +167,7 @@ static ssize_t cprime_pread(
                 files_struct *      fsp,
                 void *              data,
                        size_t              count,
-                SMB_OFF_T           offset)
+                off_t           offset)
 {
         if (g_readbuf) {
                 prime_cache(handle, fsp, offset, count);
@@ -177,10 +177,10 @@ static ssize_t cprime_pread(
 }
 
 static struct vfs_fn_pointers vfs_cacheprime_fns = {
-        .sendfile = cprime_sendfile,
-        .pread = cprime_pread,
-        .vfs_read = cprime_read,
-        .connect_fn = cprime_connect,
+    .sendfile_fn = cprime_sendfile,
+    .pread_fn = cprime_pread,
+    .read_fn = cprime_read,
+    .connect_fn = cprime_connect,
 };
 
 /* -------------------------------------------------------------------------