svn commit: samba r11428 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2005-10-31 22:30:05 +0000 (Mon, 31 Oct 2005)
New Revision: 11428

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

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

Modified:
   branches/SAMBA_3_0/source/smbd/reply.c
   branches/SAMBA_3_0/source/smbd/trans2.c
   branches/SAMBA_3_0/source/smbd/vfs.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2005-10-31 22:29:38 UTC (rev 11427)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2005-10-31 22:30:05 UTC (rev 11428)
@@ -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: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c	2005-10-31 22:29:38 UTC (rev 11427)
+++ branches/SAMBA_3_0/source/smbd/trans2.c	2005-10-31 22:30:05 UTC (rev 11428)
@@ -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: branches/SAMBA_3_0/source/smbd/vfs.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/vfs.c	2005-10-31 22:29:38 UTC (rev 11427)
+++ branches/SAMBA_3_0/source/smbd/vfs.c	2005-10-31 22:30:05 UTC (rev 11428)
@@ -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;
 	}