diff options
| author | Jeremy Allison <jra@samba.org> | 1998-08-20 19:28:37 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-08-20 19:28:37 +0000 |
| commit | dc76502cd8a950f6aff84ce4eedfd9d2b30d3dcc (patch) | |
| tree | 8d8aead30371fec7fa6b191468098d631a6002af /source3/include | |
| parent | 852519282d43d7d12c103c01ca979952f041d683 (diff) | |
| download | samba-dc76502cd8a950f6aff84ce4eedfd9d2b30d3dcc.tar.gz samba-dc76502cd8a950f6aff84ce4eedfd9d2b30d3dcc.tar.bz2 samba-dc76502cd8a950f6aff84ce4eedfd9d2b30d3dcc.zip | |
Turning on blocking locking code. NB. Blocking lock requests that are not
the head of an SMB request (ie. are part of a chain) will not be queued -
this will be fixed when we move to the new chain code. In practice, this
doesn't seem to cause much of a problem (in my admittedly limited testing)
bug a debug level zero message will be placed in the log when this
happens to help determine how real the problem is.
smbd/locking.c: New debug messages.
smbd/blocking.c: New blocking code - handles SMBlock, SMBlockread and SMBlockingX
smbd/chgpasswd.c: Fix for master fd leak.
smbd/files.c: Tidyup comment.
smbd/nttrans.c: Added fnum to debug message.
smbd/process.c: Made chain_reply() use construct_reply_common(). Added blocking
lock queue processing into idle loop.
smbd/reply.c: Added queue pushes for SMBlock, SMBlockread and SMBlockingX.
Jeremy.
(This used to be commit e1dd03ecda0bc6d7eaa31070c83774bb5679fd1b)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 9b7267658d..a4cac1c2f8 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2134,8 +2134,8 @@ void invalidate_read_prediction(int fd); BOOL receive_next_smb(int smbfd, int oplockfd, char *inbuf, int bufsize, int timeout); void process_smb(char *inbuf, char *outbuf); char *smb_fn_name(int type); -int chain_reply(char *inbuf,char *outbuf,int size,int bufsize); void construct_reply_common(char *inbuf,char *outbuf); +int chain_reply(char *inbuf,char *outbuf,int size,int bufsize); int construct_reply(char *inbuf,char *outbuf,int size,int bufsize); void smbd_process(void); @@ -2171,7 +2171,7 @@ int reply_mknew(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int reply_ctemp(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); int reply_unlink(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); int reply_readbraw(connection_struct *conn, char *inbuf, char *outbuf, int dum_size, int dum_buffsize); -int reply_lockread(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsiz); +int reply_lockread(connection_struct *conn, char *inbuf,char *outbuf, int length, int dum_buffsiz); int reply_read(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); int reply_read_and_X(connection_struct *conn, char *inbuf,char *outbuf,int length,int bufsize); int reply_writebraw(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); @@ -2187,7 +2187,7 @@ int reply_close(connection_struct *conn, int reply_writeclose(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); int reply_lock(connection_struct *conn, - char *inbuf,char *outbuf, int dum_size, int dum_buffsize); + char *inbuf,char *outbuf, int length, int dum_buffsize); int reply_unlock(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); int reply_tdis(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); |