zero size of mapped drives on samba2.2.4 with quotas

[Jeremy Allison]

On Thu, May 23, 2002 at 10:39:45PM +0400, Michail Vidiassov wrote:
> Dear Guru,
> 
> I am running samba 2.2.4 on FreeBSD 4.5
> 
> The size of mapped drives with quota enabled is always shown as 0 by W2k.
> There was no such problem with samba 2.2.3a.
> 
> As far as I undestand, th esource of the problem is the following change
> of source/smbd/trans2.c (it was intended to
> fixe the display of the 'size on disk' property of files from w2k):
> 
> ===================================================================
> RCS file: /cvsroot/samba/source/smbd/trans2.c,v
> retrieving revision 1.149.4.75
> retrieving revision 1.149.4.76
> diff -u -r1.149.4.75 -r1.149.4.76
> --- samba/source/smbd/trans2.c	2002/04/12 01:33:08	1.149.4.75
> +++ samba/source/smbd/trans2.c	2002/04/12 15:34:01	1.149.4.76
> @@ -1421,12 +1421,13 @@
>  		case SMB_QUERY_FS_SIZE_INFO:
>  		case SMB_FS_SIZE_INFORMATION:
>  		{
> -			SMB_BIG_UINT dfree,dsize,bsize;
> +			SMB_BIG_UINT dfree,dsize,bsize,secs_per_unit;;
>  			data_len = 24;
>  			conn->vfs_ops.disk_free(conn,".",False,&bsize,&dfree,&dsize);
> -			SBIG_UINT(pdata,0,dsize);
> -			SBIG_UINT(pdata,8,dfree);
> -			SIVAL(pdata,16,bsize/512);
> +			secs_per_unit = 2;
> +			SBIG_UINT(pdata,0,dsize*(bsize/(512*secs_per_unit)));
> +			SBIG_UINT(pdata,8,dfree*(bsize/(512*secs_per_unit)));
> +			SIVAL(pdata,16,secs_per_unit);
>  			SIVAL(pdata,20,512);
>  			break;
>  		}
> 
> This code seems to have problems in case bsize=512.
> It is the case with FreeBSD and disk quotas enabled.
> 
> Reversing the patch solves my disk size problem.
> 
> I seek confirmations / comments.

Can you try applying the following patch - this may not be the
correct fix - I'm checking with tridge (who wrote the original
code) to be sure.

Thanks,

	Jeremy.

--------------------------------------------------------------------
Index: smbd/trans2.c
===================================================================
RCS file: /data/cvs/samba/source/smbd/trans2.c,v
retrieving revision 1.149.4.80
diff -u -r1.149.4.80 trans2.c
--- smbd/trans2.c	2002/05/20 16:41:45	1.149.4.80
+++ smbd/trans2.c	2002/05/23 22:14:45
@@ -1439,6 +1439,12 @@
 			SMB_BIG_UINT dfree,dsize,bsize,secs_per_unit;;
 			data_len = 24;
 			conn->vfs_ops.disk_free(conn,".",False,&bsize,&dfree,&dsize);	
+			if (bsize < 1024) {
+				SMB_BIG_UINT factor = 1024/bsize;
+				bsize = 1024;
+				dsize /= factor;
+				dfree /= factor;
+			}
 			secs_per_unit = 2;
 			SBIG_UINT(pdata,0,dsize*(bsize/(512*secs_per_unit)));
 			SBIG_UINT(pdata,8,dfree*(bsize/(512*secs_per_unit)));
--------------------------------------------------------------------