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

[vlendec at samba.org]

Author: vlendec
Date: 2007-02-17 18:47:40 +0000 (Sat, 17 Feb 2007)
New Revision: 21409

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

Log:
saved_status1 is not used anymore after aio write behind was removed
Modified:
   branches/SAMBA_3_0/source/smbd/close.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/close.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/close.c	2007-02-17 13:59:32 UTC (rev 21408)
+++ branches/SAMBA_3_0/source/smbd/close.c	2007-02-17 18:47:40 UTC (rev 21409)
@@ -318,7 +318,6 @@
 	NTSTATUS status = NT_STATUS_OK;
 	NTSTATUS saved_status1 = NT_STATUS_OK;
 	NTSTATUS saved_status2 = NT_STATUS_OK;
-	NTSTATUS saved_status3 = NT_STATUS_OK;
 	connection_struct *conn = fsp->conn;
 
 	cancel_aio_by_fsp(fsp);
@@ -328,7 +327,7 @@
 	 * error here, we must remember this.
 	 */
 
-	saved_status2 = close_filestruct(fsp);
+	saved_status1 = close_filestruct(fsp);
 
 	if (fsp->print_file) {
 		print_fsp_end(fsp, close_type);
@@ -342,7 +341,7 @@
 
 	if (fsp->fh->ref_count == 1) {
 		/* Should we return on error here... ? */
-		saved_status3 = close_remove_share_mode(fsp, close_type);
+		saved_status2 = close_remove_share_mode(fsp, close_type);
 	}
 
 	if(fsp->oplock_type) {
@@ -373,8 +372,6 @@
 			status = saved_status1;
 		} else if (!NT_STATUS_IS_OK(saved_status2)) {
 			status = saved_status2;
-		} else if (!NT_STATUS_IS_OK(saved_status3)) {
-			status = saved_status3;
 		}
 	}