Fix VFS layer:

[kai/samba.git] / source3 / smbd / fileio.c

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index b612b1a45149fd65b8b4ae51136d2775e4322866..5021f54fb460f58237067de639a919ee49fd415a 100644 (file)
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -32,7 +32,7 @@ static SMB_OFF_T seek_file(files_struct *fsp,SMB_OFF_T pos)
 {
        SMB_OFF_T seek_ret;
 
-       seek_ret = fsp->conn->vfs_ops.lseek(fsp,fsp->fd,pos,SEEK_SET);
+       seek_ret = VFS_LSEEK(fsp,fsp->fd,pos,SEEK_SET);
 
        if(seek_ret == -1) {
                DEBUG(0,("seek_file: (%s) sys_lseek failed. Error was %s\n",
@@ -101,7 +101,7 @@ ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n)
 #ifdef DMF_FIX
                int numretries = 3;
 tryagain:
-               readret = fsp->conn->vfs_ops.read(fsp,fsp->fd,data,n);
+               readret = VFS_READ(fsp,fsp->fd,data,n);
                if (readret == -1) {
                        if ((errno == EAGAIN) && numretries) {
                                DEBUG(3,("read_file EAGAIN retry in 10 seconds\n"));
@@ -112,7 +112,7 @@ tryagain:
                        return -1;
                }
 #else /* NO DMF fix. */
-               readret = fsp->conn->vfs_ops.read(fsp,fsp->fd,data,n);
+               readret = VFS_READ(fsp,fsp->fd,data,n);
                if (readret == -1)
                        return -1;
 #endif
@@ -181,7 +181,7 @@ ssize_t write_file(files_struct *fsp, char *data, SMB_OFF_T pos, size_t n)
                SMB_STRUCT_STAT st;
                fsp->modified = True;
 
-               if (fsp->conn->vfs_ops.fstat(fsp,fsp->fd,&st) == 0) {
+               if (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 (MAP_ARCHIVE(fsp->conn) && !IS_DOS_ARCHIVE(dosmode))
@@ -760,7 +760,7 @@ void sync_file(connection_struct *conn, files_struct *fsp)
 {
        if(lp_strict_sync(SNUM(conn)) && fsp->fd != -1) {
                flush_write_cache(fsp, SYNC_FLUSH);
-               conn->vfs_ops.fsync(fsp,fsp->fd);
+               VFS_FSYNC(fsp,fsp->fd);
        }
 }
 
@@ -772,7 +772,7 @@ void sync_file(connection_struct *conn, files_struct *fsp)
 int fsp_stat(files_struct *fsp, SMB_STRUCT_STAT *pst)
 {
        if (fsp->fd == -1)
-               return vfs_stat(fsp->conn, fsp->fsp_name, pst);
+               return VFS_STAT(fsp->conn, fsp->fsp_name, pst);
        else
-               return vfs_fstat(fsp,fsp->fd, pst);
+               return VFS_FSTAT(fsp,fsp->fd, pst);
 }