svn commit: samba r18835 - in branches/SAMBA_4_0/source: libcli/raw ntvfs ntvfs/posix torture/smb2

[tridge at samba.org]

Author: tridge
Date: 2006-09-23 02:19:15 +0000 (Sat, 23 Sep 2006)
New Revision: 18835

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

Log:

expand IO limits on SMB2. Samba4 now tops out at 16.7MB IOs.

Modified:
   branches/SAMBA_4_0/source/libcli/raw/interfaces.h
   branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c
   branches/SAMBA_4_0/source/torture/smb2/maxwrite.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/interfaces.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/interfaces.h	2006-09-23 01:59:48 UTC (rev 18834)
+++ branches/SAMBA_4_0/source/libcli/raw/interfaces.h	2006-09-23 02:19:15 UTC (rev 18835)
@@ -1589,7 +1589,7 @@
 			uint8_t *data;
 			uint16_t remaining;
 			uint16_t compaction_mode;
-			uint16_t nread;
+			uint32_t nread;
 		} out;
 	} readx, generic;
 

Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c	2006-09-23 01:59:48 UTC (rev 18834)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c	2006-09-23 02:19:15 UTC (rev 18835)
@@ -1266,12 +1266,6 @@
 		break;
 
 	case RAW_READ_SMB2:
-		if (rd->smb2.in.length > UINT16_MAX) {
-			DEBUG(0,("%s: mapping SMB2 => generic length to large %u!\n",
-				__FUNCTION__, rd->smb2.in.length));
-			status = NT_STATUS_FOOBAR;
-			goto done;
-		}
 		rd2->readx.in.file.ntvfs= rd->smb2.in.file.ntvfs;
 		rd2->readx.in.offset    = rd->smb2.in.offset;
 		rd2->readx.in.mincnt    = rd->smb2.in.length;

Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c	2006-09-23 01:59:48 UTC (rev 18834)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_read.c	2006-09-23 02:19:15 UTC (rev 18835)
@@ -59,7 +59,7 @@
 	}
 
 	maxcnt = rd->readx.in.maxcnt;
-	if (maxcnt > UINT16_MAX) {
+	if (maxcnt > UINT16_MAX && req->ctx->protocol < PROTOCOL_SMB2) {
 		maxcnt = 0;
 	}
 

Modified: branches/SAMBA_4_0/source/torture/smb2/maxwrite.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/maxwrite.c	2006-09-23 01:59:48 UTC (rev 18834)
+++ branches/SAMBA_4_0/source/torture/smb2/maxwrite.c	2006-09-23 02:19:15 UTC (rev 18835)
@@ -37,7 +37,7 @@
 	struct smb2_read r;
 	NTSTATUS status;
 	int i, len;
-	int max = 10000000;
+	int max = 80000000;
 	int min = 1;
 
 	while (max > min) {
@@ -94,7 +94,7 @@
 
 	printf("converged: len=%d\n", max);
 
-	return status;
+	return NT_STATUS_OK;
 }