diff options
| author | Jeremy Allison <jra@samba.org> | 2007-08-15 16:58:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:50 -0500 |
| commit | 3dd3c4cd013dadd1a1f57ac3e0750018dc5a0698 (patch) | |
| tree | bbc4c0e2fee99c10ee181c20e22fa3472ae0a296 /source3/include | |
| parent | e60c0a5bff677e0626b6992b46b5a167cf14db1e (diff) | |
| download | samba-3dd3c4cd013dadd1a1f57ac3e0750018dc5a0698.tar.gz samba-3dd3c4cd013dadd1a1f57ac3e0750018dc5a0698.tar.bz2 samba-3dd3c4cd013dadd1a1f57ac3e0750018dc5a0698.zip | |
r24464: Now Volker removed the readbmpx we don't need cached errors any more.
Jeremy.
(This used to be commit 9256ec0a20f532c7dd7ddc2d3534336a47e6c2d2)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/smb.h | 12 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 6 |
2 files changed, 0 insertions, 18 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 4e03d333d9..21bdd9b5c5 100644 --- 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 7c786b03c8..85b623af01 100644 --- 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__) |