r24464: Now Volker removed the readbmpx we don't need cached errors any more.

Jeremy.
(This used to be commit 9256ec0a20f532c7dd7ddc2d3534336a47e6c2d2)

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 4e03d333d9caa6fd5ba06c65629093160cc0ad48..21bdd9b5c5ae37d19bdce7ba8961a2b692e74527 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -387,17 +387,6 @@ typedef struct time_info {
        uint32 time;
 } UTIME;
 
-/* Structure used when SMBwritebmpx is active */
-typedef struct {
-       size_t wr_total_written; /* So we know when to discard this */
-       int32 wr_timeout;
-       int32 wr_errclass; /* Cached errors */
-       int32 wr_error; /* Cached errors */
-       NTSTATUS wr_status; /* Cached errors */
-       BOOL  wr_mode; /* write through mode) */
-       BOOL  wr_discard; /* discard all further data */
-} write_bmpx_struct;
-
 typedef struct write_cache {
        SMB_OFF_T file_size;
        SMB_OFF_T offset;
@@ -495,7 +484,6 @@ typedef struct files_struct {
        mode_t mode;
        uint16 file_pid;
        uint16 vuid;
-       write_bmpx_struct *wbmpx_ptr;
        write_cache *wcp;
        struct timeval open_time;
        uint32 access_mask;             /* NTCreateX access bits (FILE_READ_DATA etc.) */

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 7c786b03c841de7f0de6ff5fae197ea4dab5e8f2..85b623af01e7e1dcb5c2a7b1625566d483c75436 100644 (file)
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -158,12 +158,6 @@
 #define SMB_LARGE_LKLEN_OFFSET_HIGH(indx) (12 + (20 * (indx)))
 #define SMB_LARGE_LKLEN_OFFSET_LOW(indx) (16 + (20 * (indx)))
 
-/* Macro to test if an error has been cached for this fnum */
-#define HAS_CACHED_ERROR(fsp) ((fsp)->wbmpx_ptr && \
-                (fsp)->wbmpx_ptr->wr_discard)
-/* Macro to turn the cached error into an error packet */
-#define CACHED_ERROR(fsp) cached_error_packet(inbuf,outbuf,fsp,__LINE__,__FILE__)
-
 #define ERROR_DOS(class,code) error_packet(inbuf,outbuf,class,code,NT_STATUS_OK,__LINE__,__FILE__)
 #define ERROR_NT(status) error_packet(inbuf,outbuf,0,0,status,__LINE__,__FILE__)
 #define ERROR_FORCE_NT(status) error_packet(inbuf,outbuf,-1,-1,status,__LINE__,__FILE__)

diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c
index ab628e29fc8819e17119eadd2e7929e49ed9905c..337fd4f74b4cb63b71c00960a729a7ba638955f7 100644 (file)
--- a/source3/printing/printfsp.c
+++ b/source3/printing/printfsp.c
@@ -82,7 +82,6 @@ NTSTATUS print_fsp_open(connection_struct *conn, const char *fname,
        fsp->sent_oplock_break = NO_BREAK_SENT;
        fsp->is_directory = False;
        string_set(&fsp->fsp_name,print_job_fname(lp_const_servicename(SNUM(conn)),jobid));
-       fsp->wbmpx_ptr = NULL;      
        fsp->wcp = NULL; 
        SMB_VFS_FSTAT(fsp,fsp->fh->fd, &sbuf);
        fsp->mode = sbuf.st_mode;

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 9718fef4ea2052171c210ccd0d147e7628478b6e..30220ce4decd44d32759d4122f015796280caac9 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -102,7 +102,6 @@ static NTSTATUS close_filestruct(files_struct *fsp)
        }
 
        conn->num_files_open--;
-       SAFE_FREE(fsp->wbmpx_ptr);
        return status;
 }    
 

diff --git a/source3/smbd/error.c b/source3/smbd/error.c
index dd9ff85640a8a99f03c407205afb26728101c306..74029a2b05cf51af8ac89aac4381505ff8f74c6e 100644 (file)
--- a/source3/smbd/error.c
+++ b/source3/smbd/error.c
@@ -24,22 +24,6 @@ extern struct unix_error_map unix_dos_nt_errmap[];
 
 extern uint32 global_client_caps;
 
-/****************************************************************************
- Create an error packet from a cached error.
-****************************************************************************/
- 
-int cached_error_packet(const char *inbuf,char *outbuf,files_struct *fsp,int line,const char *file)
-{
-       write_bmpx_struct *wbmpx = fsp->wbmpx_ptr;
-       int32 eclass = wbmpx->wr_errclass;
-       int32 err = wbmpx->wr_error;
-       NTSTATUS ntstatus = wbmpx->wr_status;
- 
-       /* We can now delete the auxiliary struct */
-       SAFE_FREE(fsp->wbmpx_ptr);
-       return error_packet(inbuf,outbuf,eclass,err,ntstatus,line,file);
-}
-
 /****************************************************************************
  Create an error packet from errno.
 ****************************************************************************/