svn commit: samba r11427 - in trunk/source/smbd: .

[jra]

Author: jra
Date: 2005-10-31 22:29:38 +0000 (Mon, 31 Oct 2005)
New Revision: 11427

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11427

Log:
Fix bug #3192 by actually hooking up the dfree caching
function. Oops.
Jeremy.

Modified:
   trunk/source/smbd/reply.c
   trunk/source/smbd/trans2.c
   trunk/source/smbd/vfs.c


Changeset:
Modified: trunk/source/smbd/reply.c
===================================================================
--- trunk/source/smbd/reply.c   2005-10-31 22:25:29 UTC (rev 11426)
+++ trunk/source/smbd/reply.c   2005-10-31 22:29:38 UTC (rev 11427)
@@ -1004,7 +1004,7 @@
        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));
        }

Modified: trunk/source/smbd/trans2.c
===================================================================
--- trunk/source/smbd/trans2.c  2005-10-31 22:25:29 UTC (rev 11426)
+++ trunk/source/smbd/trans2.c  2005-10-31 22:29:38 UTC (rev 11427)
@@ -2151,7 +2151,7 @@
                {
                        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 @@
                {
                        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 @@
                {
                        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);

Modified: trunk/source/smbd/vfs.c
===================================================================
--- trunk/source/smbd/vfs.c     2005-10-31 22:25:29 UTC (rev 11426)
+++ trunk/source/smbd/vfs.c     2005-10-31 22:29:38 UTC (rev 11427)
@@ -563,7 +563,7 @@
 
        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;
        }