Attachment 157371 Details for Bug 244848 – Jeremy's patch adapted by me, for 3.0.10-1.4E.12.2

[patch] Jeremy's patch adapted by me, for 3.0.10-1.4E.12.2

samba-3.0.10-checkerr-onsync.patch (text/plain), 6.76 KB, created by David Losada on 2007-06-19 14:12:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Losada

Created: 2007-06-19 14:12:09 UTC

Size: 6.76 KB

patch

obsolete

>diff -r -U 5 samba-3.0.10/source/smbd/fileio.c samba-3.0.10b/source/smbd/fileio.c
>--- samba-3.0.10/source/smbd/fileio.c	2004-12-15 15:33:17.000000000 +0100
>+++ samba-3.0.10b/source/smbd/fileio.c	2007-06-18 20:27:32.000000000 +0200
>@@ -749,16 +749,26 @@
> 
> /*******************************************************************
> sync a file
> ********************************************************************/
> 
>-void sync_file(connection_struct *conn, files_struct *fsp)
>+NTSTATUS sync_file(connection_struct *conn, files_struct *fsp)
> {
>-	if(lp_strict_sync(SNUM(conn)) && fsp->fd != -1) {
>-		flush_write_cache(fsp, SYNC_FLUSH);
>-		SMB_VFS_FSYNC(fsp,fsp->fd);
>+	if(fsp->fd == -1)
>+		return NT_STATUS_INVALID_HANDLE;
>+		
>+	if(lp_strict_sync(SNUM(conn))) {
>+		int ret = flush_write_cache(fsp, SYNC_FLUSH);
>+		if (ret == -1) {
>+			return map_nt_error_from_unix(errno);
>+		}
>+		ret = SMB_VFS_FSYNC(fsp,fsp->fd);
>+		if (ret == -1) {
>+			return map_nt_error_from_unix(errno);
>+		}
> 	}
>+	return NT_STATUS_OK;
> }
> 
> 
> /************************************************************
>  Perform a stat whether a valid fd or not.
>diff -r -U 5 samba-3.0.10/source/smbd/reply.c samba-3.0.10b/source/smbd/reply.c
>--- samba-3.0.10/source/smbd/reply.c	2007-06-12 00:06:59.000000000 +0200
>+++ samba-3.0.10b/source/smbd/reply.c	2007-06-18 19:59:29.000000000 +0200
>@@ -2233,10 +2233,11 @@
> 	SMB_OFF_T startpos;
> 	char *data=NULL;
> 	BOOL write_through;
> 	files_struct *fsp = file_fsp(inbuf,smb_vwv0);
> 	int outsize = 0;
>+	NTSTATUS status;
> 	START_PROFILE(SMBwritebraw);
> 
> 	if (srv_is_signing_active()) {
> 		exit_server("reply_writebraw: SMB signing is active - raw reads/writes are disallowed.");
> 	}
>@@ -2329,12 +2330,19 @@
> 
> 		if (nwritten > 0)
> 			total_written += nwritten;
>  	}
>  
>-	if ((lp_syncalways(SNUM(conn)) || write_through) && lp_strict_sync(SNUM(conn)))
>-		sync_file(conn,fsp);
>+	if ((lp_syncalways(SNUM(conn)) || write_through) && lp_strict_sync(SNUM(conn))) {
>+		status = sync_file(conn,fsp);
>+		if (!NT_STATUS_IS_OK(status)) {
>+			DEBUG(5,("reply_writebraw: sync_file for %s returned %s\n",
>+				fsp->fsp_name, nt_errstr(status) ));
>+			END_PROFILE(SMBwritebraw);
>+			return ERROR_NT(status);
>+		}
>+	}
> 
> 	DEBUG(3,("writebraw2 fnum=%d start=%.0f num=%d wrote=%d\n",
> 		fsp->fnum, (double)startpos, (int)numtowrite,(int)total_written));
> 
> 	/* we won't return a status if write through is not selected - this follows what WfWg does */
>@@ -2390,12 +2398,19 @@
> 	if(numtowrite == 0)
> 		nwritten = 0;
> 	else
> 		nwritten = write_file(fsp,data,startpos,numtowrite);
>   
>-	if (lp_syncalways(SNUM(conn)))
>-		sync_file(conn,fsp);
>+	if (lp_syncalways(SNUM(conn))) {
>+		status = sync_file(conn,fsp);
>+		if (!NT_STATUS_IS_OK(status)) {
>+			END_PROFILE(SMBwriteunlock);
>+			DEBUG(5,("reply_writeunlock: sync_file for %s returned %s\n",
>+				fsp->fsp_name, nt_errstr(status) ));
>+			return ERROR_NT(status);
>+		}
>+	}
> 
> 	if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
> 		END_PROFILE(SMBwriteunlock);
> 		return(UNIXERROR(ERRHRD,ERRdiskfull));
> 	}
>@@ -2430,10 +2445,11 @@
> 	ssize_t nwritten = -1;
> 	SMB_OFF_T startpos;
> 	char *data;
> 	files_struct *fsp = file_fsp(inbuf,smb_vwv0);
> 	int outsize = 0;
>+	NTSTATUS status;
> 	START_PROFILE(SMBwrite);
> 
> 	/* If it's an IPC, pass off the pipe handler. */
> 	if (IS_IPC(conn)) {
> 		END_PROFILE(SMBwrite);
>@@ -2473,12 +2489,19 @@
> 			return ERROR_NT(NT_STATUS_DISK_FULL);
> 		}
> 	} else
> 		nwritten = write_file(fsp,data,startpos,numtowrite);
>   
>-	if (lp_syncalways(SNUM(conn)))
>-		sync_file(conn,fsp);
>+	if (lp_syncalways(SNUM(conn))) {
>+		status = sync_file(conn,fsp);
>+		if (!NT_STATUS_IS_OK(status)) {
>+			END_PROFILE(SMBwrite);
>+			DEBUG(5,("reply_write: sync_file for %s returned %s\n",
>+				fsp->fsp_name, nt_errstr(status) ));
>+			return ERROR_NT(status);
>+		}
>+	}
> 
> 	if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
> 		END_PROFILE(SMBwrite);
> 		return(UNIXERROR(ERRHRD,ERRdiskfull));
> 	}
>@@ -2511,10 +2534,11 @@
> 	ssize_t nwritten = -1;
> 	unsigned int smb_doff = SVAL(inbuf,smb_vwv11);
> 	unsigned int smblen = smb_len(inbuf);
> 	char *data;
> 	BOOL large_writeX = ((CVAL(inbuf,smb_wct) == 14) && (smblen > 0xFFFF));
>+	NTSTATUS status;
> 	START_PROFILE(SMBwriteX);
> 
> 	/* If it's an IPC, pass off the pipe handler. */
> 	if (IS_IPC(conn)) {
> 		END_PROFILE(SMBwriteX);
>@@ -2590,12 +2614,19 @@
> 	}
> 
> 	DEBUG(3,("writeX fnum=%d num=%d wrote=%d\n",
> 		fsp->fnum, (int)numtowrite, (int)nwritten));
> 
>-	if (lp_syncalways(SNUM(conn)) || write_through)
>-		sync_file(conn,fsp);
>+	if (lp_syncalways(SNUM(conn)) || write_through) {
>+		status = sync_file(conn,fsp);
>+		if (!NT_STATUS_IS_OK(status)) {
>+			END_PROFILE(SMBwriteX);
>+			DEBUG(5,("reply_write_and_X: sync_file for %s returned %s\n",
>+				fsp->fsp_name, nt_errstr(status) ));
>+			return ERROR_NT(status);
>+		}
>+	}
> 
> 	END_PROFILE(SMBwriteX);
> 	return chain_reply(inbuf,outbuf,length,bufsize);
> }
> 
>@@ -2688,11 +2719,17 @@
> 		CHECK_FSP(fsp,conn);
> 	
> 	if (!fsp) {
> 		file_sync_all(conn);
> 	} else {
>-		sync_file(conn,fsp);
>+		NTSTATUS status = sync_file(conn,fsp);
>+		if (!NT_STATUS_IS_OK(status)) {
>+			END_PROFILE(SMBflush);
>+			DEBUG(5,("reply_flush: sync_file for %s returned %s\n",
>+				fsp->fsp_name, nt_errstr(status) ));
>+			return ERROR_NT(status);
>+		}
> 	}
> 	
> 	DEBUG(3,("flush\n"));
> 	END_PROFILE(SMBflush);
> 	return(outsize);
>@@ -4839,10 +4876,11 @@
> 	size_t tcount;
> 	BOOL write_through;
> 	int smb_doff;
> 	char *data;
> 	files_struct *fsp = file_fsp(inbuf,smb_vwv0);
>+	NTSTATUS status;
> 	START_PROFILE(SMBwriteBmpx);
> 
> 	CHECK_FSP(fsp,conn);
> 	CHECK_WRITE(fsp);
> 	CHECK_ERROR(fsp);
>@@ -4864,12 +4902,19 @@
> 		return(ERROR_DOS(ERRDOS,ERRlock));
> 	}
> 
> 	nwritten = write_file(fsp,data,startpos,numtowrite);
> 
>-	if(lp_syncalways(SNUM(conn)) || write_through)
>-		sync_file(conn,fsp);
>+	if(lp_syncalways(SNUM(conn)) || write_through) {
>+		status = sync_file(conn,fsp);
>+		if (!NT_STATUS_IS_OK(status)) {
>+			END_PROFILE(SMBwriteBmpx);
>+			DEBUG(5,("reply_writebmpx: sync_file for %s returned %s\n",
>+				fsp->fsp_name, nt_errstr(status) ));
>+			return ERROR_NT(status);
>+		}
>+	}
>   
> 	if(nwritten < (ssize_t)numtowrite) {
> 		END_PROFILE(SMBwriteBmpx);
> 		return(UNIXERROR(ERRHRD,ERRdiskfull));
> 	}
>@@ -4940,10 +4985,11 @@
> 	int smb_doff;
> 	char *data;
> 	write_bmpx_struct *wbms;
> 	BOOL send_response = False; 
> 	files_struct *fsp = file_fsp(inbuf,smb_vwv0);
>+	NTSTATUS status;
> 	START_PROFILE(SMBwriteBs);
> 
> 	CHECK_FSP(fsp,conn);
> 	CHECK_WRITE(fsp);
> 
>@@ -4975,13 +5021,13 @@
> 	}
> 
> 	nwritten = write_file(fsp,data,startpos,numtowrite);
> 
> 	if(lp_syncalways(SNUM(conn)) || write_through)
>-		sync_file(conn,fsp);
>+		status = sync_file(conn,fsp);
>   
>-	if (nwritten < (ssize_t)numtowrite) {
>+	if (nwritten < (ssize_t)numtowrite || !NT_STATUS_IS_OK(status)) {
> 		if(write_through) {
> 			/* We are returning an error - we can delete the aux struct */
> 			if (wbms)
> 				free((char *)wbms);
> 			fsp->wbmpx_ptr = NULL;

Actions: View | Diff

Attachments on bug 244848: 157370 | 157371