r11428: Fix bug #3192 by actually hooking up the dfree caching

function. Oops.
Jeremy.
(This used to be commit 7edb26e7657fc01710abe563b941779749409ef2)

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f73eea3fa69df2ae239ffdfb5bf83c7b9fd84fa6..8ca7c2a103e11d1fae2699631d34078f61473a55 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1004,7 +1004,7 @@ int reply_dskattr(connection_struct *conn, char *inbuf,char *outbuf, int dum_siz
        SMB_BIG_UINT dfree,dsize,bsize;
        START_PROFILE(SMBdskattr);
 
-       if (SMB_VFS_DISK_FREE(conn,".",True,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+       if (get_dfree_info(conn,".",True,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
                END_PROFILE(SMBdskattr);
                return(UNIXERROR(ERRHRD,ERRgeneral));
        }

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a9b67cc48437f86f9749064d720d69ba8e44f632..beaf35caa22f2b672148f9ad228fe428127f0bb3 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2151,7 +2151,7 @@ static int call_trans2qfsinfo(connection_struct *conn, char *inbuf, char *outbuf
                {
                        SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 18;
-                       if (SMB_VFS_DISK_FREE(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+                       if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
                                return(UNIXERROR(ERRHRD,ERRgeneral));
                        }
 
@@ -2252,7 +2252,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_dev, (unsi
                {
                        SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 24;
-                       if (SMB_VFS_DISK_FREE(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+                       if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
                                return(UNIXERROR(ERRHRD,ERRgeneral));
                        }
                        block_size = lp_block_size(snum);
@@ -2284,7 +2284,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                {
                        SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
                        data_len = 32;
-                       if (SMB_VFS_DISK_FREE(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+                       if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
                                return(UNIXERROR(ERRHRD,ERRgeneral));
                        }
                        block_size = lp_block_size(snum);

diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 52966d59aea6b0fefc0eb0fc91b4a07a5c0c78fe..001d42d172f0d5cf1b8f3faf4e90512ae53d73a0 100644 (file)
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -563,7 +563,7 @@ int vfs_allocate_file_space(files_struct *fsp, SMB_BIG_UINT len)
 
        len -= st.st_size;
        len /= 1024; /* Len is now number of 1k blocks needed. */
-       space_avail = SMB_VFS_DISK_FREE(conn,fsp->fsp_name,False,&bsize,&dfree,&dsize);
+       space_avail = get_dfree_info(conn,fsp->fsp_name,False,&bsize,&dfree,&dsize);
        if (space_avail == (SMB_BIG_UINT)-1) {
                return -1;
        }