svn commit: samba r3083 - in branches/SAMBA_4_0/source/ntvfs: .

[tridge at samba.org]

Author: tridge
Date: 2004-10-20 11:10:51 +0000 (Wed, 20 Oct 2004)
New Revision: 3083

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/ntvfs&rev=3083&nolog=1

Log:
fixed a couple of generic mapping errors found with RAW-* and cifs:mapgeneric

Modified:
   branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c	2004-10-20 11:08:58 UTC (rev 3082)
+++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c	2004-10-20 11:10:51 UTC (rev 3083)
@@ -773,7 +773,8 @@
 
 		wr->writeunlock.out.nwritten = wr2->generic.out.nwritten;
 
-		if (NT_STATUS_IS_OK(status)) {
+		if (NT_STATUS_IS_OK(status) && 
+		    lck->unlock.in.count != 0) {
 			status = ntvfs->ops->lock(ntvfs, req, lck);
 		}
 		break;
@@ -798,7 +799,8 @@
 		status = ntvfs->ops->write(ntvfs, req, wr2);
 		wr->writeclose.out.nwritten    = wr2->generic.out.nwritten;
 
-		if (NT_STATUS_IS_OK(status)) {
+		if (NT_STATUS_IS_OK(status) &&
+		    wr2->generic.in.count != 0) {
 			status = ntvfs->ops->close(ntvfs, req, cl);
 		}
 		break;