diff options
| author | Jeremy Allison <jra@samba.org> | 2005-10-31 22:30:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:15 -0500 |
| commit | 86909281c8e128c5aef08f51615b868e1c179964 (patch) | |
| tree | 4bd813f1a6a6ced0d966c4bcef12b8d0cd2ed8f7 /source3 | |
| parent | 6baec64a7370ff1871f0b806a623b1fc1a898acb (diff) | |
| download | samba-86909281c8e128c5aef08f51615b868e1c179964.tar.gz samba-86909281c8e128c5aef08f51615b868e1c179964.tar.bz2 samba-86909281c8e128c5aef08f51615b868e1c179964.zip | |
r11428: Fix bug #3192 by actually hooking up the dfree caching
function. Oops.
Jeremy.
(This used to be commit 7edb26e7657fc01710abe563b941779749409ef2)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/reply.c | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 6 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index f73eea3fa6..8ca7c2a103 100644 --- 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 a9b67cc484..beaf35caa2 100644 --- 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 52966d59ae..001d42d172 100644 --- 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; } |