s3: Add strict lock/unlock calls to the vfs layer to replace is_locked

1 files changed, 116 insertions, 63 deletions

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 22e4c1aad7..a743385f7f 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2859,6 +2859,7 @@ void reply_readbraw(struct smb_request *req)
 	size_t nread = 0;
 	SMB_OFF_T startpos;
 	files_struct *fsp;
+	struct lock_struct lock;
 	SMB_STRUCT_STAT st;
 	SMB_OFF_T size = 0;
 
@@ -2959,10 +2960,11 @@ void reply_readbraw(struct smb_request *req)
 	/* ensure we don't overrun the packet size */
 	maxcount = MIN(65535,maxcount);
 
-	if (is_locked(fsp,(uint32)req->smbpid,
-			(uint64_t)maxcount,
-			(uint64_t)startpos,
-			READ_LOCK)) {
+	init_strict_lock_struct(fsp, (uint32)req->smbpid,
+	    (uint64_t)startpos, (uint64_t)maxcount, READ_LOCK,
+	    &lock);
+
+	if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
 		reply_readbraw_error();
 		END_PROFILE(SMBreadbraw);
 		return;
@@ -2993,7 +2995,11 @@ void reply_readbraw(struct smb_request *req)
 	send_file_readbraw(conn, req, fsp, startpos, nread, mincount);
 
 	DEBUG(5,("reply_readbraw finished\n"));
+
+	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
 	END_PROFILE(SMBreadbraw);
+	return;
 }
 
 #undef DBGC_CLASS
@@ -3121,6 +3127,7 @@ void reply_read(struct smb_request *req)
 	SMB_OFF_T startpos;
 	int outsize = 0;
 	files_struct *fsp;
+	struct lock_struct lock;
 
 	START_PROFILE(SMBread);
 
@@ -3162,8 +3169,11 @@ Returning short read of maximum allowed for compatibility with Windows 2000.\n",
 
 	data = smb_buf(req->outbuf) + 3;
 
-	if (is_locked(fsp, (uint32)req->smbpid, (uint64_t)numtoread,
-		      (uint64_t)startpos, READ_LOCK)) {
+	init_strict_lock_struct(fsp, (uint32)req->smbpid,
+	    (uint64_t)startpos, (uint64_t)numtoread, READ_LOCK,
+	    &lock);
+
+	if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
 		reply_doserror(req, ERRDOS,ERRlock);
 		END_PROFILE(SMBread);
 		return;
@@ -3174,8 +3184,7 @@ Returning short read of maximum allowed for compatibility with Windows 2000.\n",
 
 	if (nread < 0) {
 		reply_unixerror(req, ERRDOS,ERRnoaccess);
-		END_PROFILE(SMBread);
-		return;
+		goto strict_unlock;
 	}
 
 	srv_set_message((char *)req->outbuf, 5, nread+3, False);
@@ -3188,6 +3197,9 @@ Returning short read of maximum allowed for compatibility with Windows 2000.\n",
 	DEBUG( 3, ( "read fnum=%d num=%d nread=%d\n",
 		fsp->fnum, (int)numtoread, (int)nread ) );
 
+strict_unlock:
+	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
 	END_PROFILE(SMBread);
 	return;
 }
@@ -3387,6 +3399,7 @@ void reply_read_and_X(struct smb_request *req)
 	files_struct *fsp;
 	SMB_OFF_T startpos;
 	size_t smb_maxcnt;
+	struct lock_struct lock;
 	bool big_readX = False;
 #if 0
 	size_t smb_mincnt = SVAL(req->vwv+6, 0);
@@ -3474,8 +3487,11 @@ void reply_read_and_X(struct smb_request *req)
 
 	}
 
-	if (is_locked(fsp, (uint32)req->smbpid, (uint64_t)smb_maxcnt,
-		      (uint64_t)startpos, READ_LOCK)) {
+	init_strict_lock_struct(fsp, (uint32)req->smbpid,
+	    (uint64_t)startpos, (uint64_t)smb_maxcnt, READ_LOCK,
+	    &lock);
+
+	if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
 		END_PROFILE(SMBreadX);
 		reply_doserror(req, ERRDOS, ERRlock);
 		return;
@@ -3483,12 +3499,14 @@ void reply_read_and_X(struct smb_request *req)
 
 	if (!big_readX &&
 	    schedule_aio_read_and_X(conn, req, fsp, startpos, smb_maxcnt)) {
-		END_PROFILE(SMBreadX);
-		return;
+		goto strict_unlock;
 	}
 
 	send_file_readX(conn, req, fsp,	startpos, smb_maxcnt);
 
+strict_unlock:
+	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
 	END_PROFILE(SMBreadX);
 	return;
 }
@@ -3523,6 +3541,7 @@ void reply_writebraw(struct smb_request *req)
 	char *data=NULL;
 	bool write_through;
 	files_struct *fsp;
+	struct lock_struct lock;
 	NTSTATUS status;
 
 	START_PROFILE(SMBwritebraw);
@@ -3584,8 +3603,11 @@ void reply_writebraw(struct smb_request *req)
 		return;
 	}
 
-	if (is_locked(fsp,(uint32)req->smbpid,(uint64_t)tcount,
-				(uint64_t)startpos, WRITE_LOCK)) {
+	init_strict_lock_struct(fsp, (uint32)req->smbpid,
+	    (uint64_t)startpos, (uint64_t)tcount, WRITE_LOCK,
+	    &lock);
+
+	if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
 		reply_doserror(req, ERRDOS, ERRlock);
 		error_to_writebrawerr(req);
 		END_PROFILE(SMBwritebraw);
@@ -3604,8 +3626,7 @@ void reply_writebraw(struct smb_request *req)
 	if (nwritten < (ssize_t)numtowrite)  {
 		reply_unixerror(req, ERRHRD, ERRdiskfull);
 		error_to_writebrawerr(req);
-		END_PROFILE(SMBwritebraw);
-		return;
+		goto strict_unlock;
 	}
 
 	total_written = nwritten;
@@ -3615,8 +3636,7 @@ void reply_writebraw(struct smb_request *req)
 	if (!buf) {
 		reply_doserror(req, ERRDOS, ERRnomem);
 		error_to_writebrawerr(req);
-		END_PROFILE(SMBwritebraw);
-		return;
+		goto strict_unlock;
 	}
 
 	/* Return a SMBwritebraw message to the redirector to tell
@@ -3674,8 +3694,7 @@ void reply_writebraw(struct smb_request *req)
 			TALLOC_FREE(buf);
 			reply_unixerror(req, ERRHRD, ERRdiskfull);
 			error_to_writebrawerr(req);
-			END_PROFILE(SMBwritebraw);
-			return;
+			goto strict_unlock;
 		}
 
 		if (nwritten < (ssize_t)numtowrite) {
@@ -3697,8 +3716,7 @@ void reply_writebraw(struct smb_request *req)
 			fsp->fsp_name, nt_errstr(status) ));
 		reply_nterror(req, status);
 		error_to_writebrawerr(req);
-		END_PROFILE(SMBwritebraw);
-		return;
+		goto strict_unlock;
 	}
 
 	DEBUG(3,("reply_writebraw: secondart write fnum=%d start=%.0f num=%d "
@@ -3706,6 +3724,8 @@ void reply_writebraw(struct smb_request *req)
 		fsp->fnum, (double)startpos, (int)numtowrite,
 		(int)total_written));
 
+	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
 	/* We won't return a status if write through is not selected - this
 	 * follows what WfWg does */
 	END_PROFILE(SMBwritebraw);
@@ -3726,6 +3746,12 @@ void reply_writebraw(struct smb_request *req)
 		TALLOC_FREE(req->outbuf);
 	}
 	return;
+
+strict_unlock:
+	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
+	END_PROFILE(SMBwritebraw);
+	return;
 }
 
 #undef DBGC_CLASS
@@ -3744,6 +3770,7 @@ void reply_writeunlock(struct smb_request *req)
 	const char *data;
 	NTSTATUS status = NT_STATUS_OK;
 	files_struct *fsp;
+	struct lock_struct lock;
 
 	START_PROFILE(SMBwriteunlock);
 
@@ -3770,12 +3797,16 @@ void reply_writeunlock(struct smb_request *req)
 	startpos = IVAL_TO_SMB_OFF_T(req->vwv+2, 0);
 	data = (const char *)req->buf + 3;
 
-	if (numtowrite
-	    && is_locked(fsp, (uint32)req->smbpid, (uint64_t)numtowrite,
-			 (uint64_t)startpos, WRITE_LOCK)) {
-		reply_doserror(req, ERRDOS, ERRlock);
-		END_PROFILE(SMBwriteunlock);
-		return;
+	if (numtowrite) {
+		init_strict_lock_struct(fsp, (uint32)req->smbpid,
+		    (uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
+		    &lock);
+
+		if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
+			reply_doserror(req, ERRDOS, ERRlock);
+			END_PROFILE(SMBwriteunlock);
+			return;
+		}
 	}
 
 	/* The special X/Open SMB protocol handling of
@@ -3792,14 +3823,12 @@ void reply_writeunlock(struct smb_request *req)
 		DEBUG(5,("reply_writeunlock: sync_file for %s returned %s\n",
 			fsp->fsp_name, nt_errstr(status) ));
 		reply_nterror(req, status);
-		END_PROFILE(SMBwriteunlock);
-		return;
+		goto strict_unlock;
 	}
 
 	if(((nwritten < numtowrite) && (numtowrite != 0))||(nwritten < 0)) {
 		reply_unixerror(req, ERRHRD, ERRdiskfull);
-		END_PROFILE(SMBwriteunlock);
-		return;
+		goto strict_unlock;
 	}
 
 	if (numtowrite) {
@@ -3812,8 +3841,7 @@ void reply_writeunlock(struct smb_request *req)
 
 		if (NT_STATUS_V(status)) {
 			reply_nterror(req, status);
-			END_PROFILE(SMBwriteunlock);
-			return;
+			goto strict_unlock;
 		}
 	}
 
@@ -3824,6 +3852,11 @@ void reply_writeunlock(struct smb_request *req)
 	DEBUG(3,("writeunlock fnum=%d num=%d wrote=%d\n",
 		 fsp->fnum, (int)numtowrite, (int)nwritten));
 
+strict_unlock:
+	if (numtowrite) {
+		SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+	}
+
 	END_PROFILE(SMBwriteunlock);
 	return;
 }
@@ -3843,6 +3876,7 @@ void reply_write(struct smb_request *req)
 	SMB_OFF_T startpos;
 	const char *data;
 	files_struct *fsp;
+	struct lock_struct lock;
 	NTSTATUS status;
 
 	START_PROFILE(SMBwrite);
@@ -3877,8 +3911,11 @@ void reply_write(struct smb_request *req)
 	startpos = IVAL_TO_SMB_OFF_T(req->vwv+2, 0);
 	data = (const char *)req->buf + 3;
 
-	if (is_locked(fsp, (uint32)req->smbpid, (uint64_t)numtowrite,
-		      (uint64_t)startpos, WRITE_LOCK)) {
+	init_strict_lock_struct(fsp, (uint32)req->smbpid,
+	    (uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
+	    &lock);
+
+	if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
 		reply_doserror(req, ERRDOS, ERRlock);
 		END_PROFILE(SMBwrite);
 		return;
@@ -3897,14 +3934,12 @@ void reply_write(struct smb_request *req)
 		nwritten = vfs_allocate_file_space(fsp, (SMB_OFF_T)startpos);
 		if (nwritten < 0) {
 			reply_nterror(req, NT_STATUS_DISK_FULL);
-			END_PROFILE(SMBwrite);
-			return;
+			goto strict_unlock;
 		}
 		nwritten = vfs_set_filelen(fsp, (SMB_OFF_T)startpos);
 		if (nwritten < 0) {
 			reply_nterror(req, NT_STATUS_DISK_FULL);
-			END_PROFILE(SMBwrite);
-			return;
+			goto strict_unlock;
 		}
 		trigger_write_time_update_immediate(fsp);
 	} else {
@@ -3916,14 +3951,12 @@ void reply_write(struct smb_request *req)
 		DEBUG(5,("reply_write: sync_file for %s returned %s\n",
 			fsp->fsp_name, nt_errstr(status) ));
 		reply_nterror(req, status);
-		END_PROFILE(SMBwrite);
-		return;
+		goto strict_unlock;
 	}
 
 	if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
 		reply_unixerror(req, ERRHRD, ERRdiskfull);
-		END_PROFILE(SMBwrite);
-		return;
+		goto strict_unlock;
 	}
 
 	reply_outbuf(req, 1, 0);
@@ -3937,6 +3970,9 @@ void reply_write(struct smb_request *req)
 
 	DEBUG(3,("write fnum=%d num=%d wrote=%d\n", fsp->fnum, (int)numtowrite, (int)nwritten));
 
+strict_unlock:
+	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
 	END_PROFILE(SMBwrite);
 	return;
 }
@@ -4034,6 +4070,7 @@ void reply_write_and_X(struct smb_request *req)
 {
 	connection_struct *conn = req->conn;
 	files_struct *fsp;
+	struct lock_struct lock;
 	SMB_OFF_T startpos;
 	size_t numtowrite;
 	bool write_through;
@@ -4136,9 +4173,11 @@ void reply_write_and_X(struct smb_request *req)
 #endif /* LARGE_SMB_OFF_T */
 	}
 
-	if (is_locked(fsp,(uint32)req->smbpid,
-		      (uint64_t)numtowrite,
-		      (uint64_t)startpos, WRITE_LOCK)) {
+	init_strict_lock_struct(fsp, (uint32)req->smbpid,
+	    (uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
+	    &lock);
+
+	if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
 		reply_doserror(req, ERRDOS, ERRlock);
 		END_PROFILE(SMBwriteX);
 		return;
@@ -4156,8 +4195,7 @@ void reply_write_and_X(struct smb_request *req)
 		if ((req->unread_bytes == 0) &&
 		    schedule_aio_write_and_X(conn, req, fsp, data, startpos,
 					     numtowrite)) {
-			END_PROFILE(SMBwriteX);
-			return;
+			goto strict_unlock;
 		}
 
 		nwritten = write_file(req,fsp,data,startpos,numtowrite);
@@ -4165,8 +4203,7 @@ void reply_write_and_X(struct smb_request *req)
 
 	if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
 		reply_unixerror(req, ERRHRD, ERRdiskfull);
-		END_PROFILE(SMBwriteX);
-		return;
+		goto strict_unlock;
 	}
 
 	reply_outbuf(req, 6, 0);
@@ -4186,13 +4223,20 @@ void reply_write_and_X(struct smb_request *req)
 		DEBUG(5,("reply_write_and_X: sync_file for %s returned %s\n",
 			fsp->fsp_name, nt_errstr(status) ));
 		reply_nterror(req, status);
-		END_PROFILE(SMBwriteX);
-		return;
+		goto strict_unlock;
 	}
 
+	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
 	END_PROFILE(SMBwriteX);
 	chain_reply(req);
 	return;
+
+strict_unlock:
+	SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+
+	END_PROFILE(SMBwriteX);
+	return;
 }
 
 /****************************************************************************
@@ -4432,6 +4476,7 @@ void reply_writeclose(struct smb_request *req)
 	const char *data;
 	struct timespec mtime;
 	files_struct *fsp;
+	struct lock_struct lock;
 
 	START_PROFILE(SMBwriteclose);
 
@@ -4458,12 +4503,16 @@ void reply_writeclose(struct smb_request *req)
 	mtime = convert_time_t_to_timespec(srv_make_unix_date3(req->vwv+4));
 	data = (const char *)req->buf + 1;
 
-	if (numtowrite
-	    && is_locked(fsp, (uint32)req->smbpid, (uint64_t)numtowrite,
-			 (uint64_t)startpos, WRITE_LOCK)) {
-		reply_doserror(req, ERRDOS,ERRlock);
-		END_PROFILE(SMBwriteclose);
-		return;
+	if (numtowrite) {
+		init_strict_lock_struct(fsp, (uint32)req->smbpid,
+		    (uint64_t)startpos, (uint64_t)numtowrite, WRITE_LOCK,
+		    &lock);
+
+		if (!SMB_VFS_STRICT_LOCK(conn, fsp, &lock)) {
+			reply_doserror(req, ERRDOS,ERRlock);
+			END_PROFILE(SMBwriteclose);
+			return;
+		}
 	}
 
 	nwritten = write_file(req,fsp,data,startpos,numtowrite);
@@ -4487,19 +4536,23 @@ void reply_writeclose(struct smb_request *req)
 
 	if(((nwritten == 0) && (numtowrite != 0))||(nwritten < 0)) {
 		reply_doserror(req, ERRHRD, ERRdiskfull);
-		END_PROFILE(SMBwriteclose);
-		return;
+		goto strict_unlock;
 	}
 
 	if(!NT_STATUS_IS_OK(close_status)) {
 		reply_nterror(req, close_status);
-		END_PROFILE(SMBwriteclose);
-		return;
+		goto strict_unlock;
 	}
 
 	reply_outbuf(req, 1, 0);
 
 	SSVAL(req->outbuf,smb_vwv0,nwritten);
+
+strict_unlock:
+	if (numtowrite) {
+		SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
+	}
+
 	END_PROFILE(SMBwriteclose);
 	return;
 }