The Samba-Bugzilla – Attachment 981 Details for
Bug 2146
File corruption when compiling with Visual Studio 6.0 over Samba
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
look (text/plain), 3.86 KB, created by
Jeremy Allison
on 2005-02-24 19:23:26 UTC
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2005-02-24 19:23:26 UTC
Size:
3.86 KB
patch
obsolete
>Index: smbd/nttrans.c >=================================================================== >--- smbd/nttrans.c (revision 5547) >+++ smbd/nttrans.c (working copy) >@@ -929,7 +929,7 @@ > allocation_size |= (((SMB_BIG_UINT)IVAL(inbuf,smb_ntcreate_AllocationSize + 4)) << 32); > #endif > if (allocation_size && (allocation_size > (SMB_BIG_UINT)file_len)) { >- fsp->initial_allocation_size = smb_roundup(allocation_size); >+ fsp->initial_allocation_size = allocation_size; > if (fsp->is_directory) { > close_file(fsp,False); > END_PROFILE(SMBntcreateX); >@@ -942,7 +942,7 @@ > return ERROR_NT(NT_STATUS_DISK_FULL); > } > } else { >- fsp->initial_allocation_size = smb_roundup((SMB_BIG_UINT)file_len); >+ fsp->initial_allocation_size = (SMB_BIG_UINT)file_len; > } > > /* >@@ -1472,7 +1472,7 @@ > allocation_size |= (((SMB_BIG_UINT)IVAL(params,16)) << 32); > #endif > if (allocation_size && (allocation_size > file_len)) { >- fsp->initial_allocation_size = smb_roundup(allocation_size); >+ fsp->initial_allocation_size = allocation_size; > if (fsp->is_directory) { > close_file(fsp,False); > END_PROFILE(SMBntcreateX); >@@ -1484,7 +1484,7 @@ > return ERROR_NT(NT_STATUS_DISK_FULL); > } > } else { >- fsp->initial_allocation_size = smb_roundup((SMB_BIG_UINT)file_len); >+ fsp->initial_allocation_size = (SMB_BIG_UINT)file_len; > } > > /* Realloc the size of parameters and data we will return */ >Index: smbd/trans2.c >=================================================================== >--- smbd/trans2.c (revision 5547) >+++ smbd/trans2.c (working copy) >@@ -33,21 +33,6 @@ > #define DIR_ENTRY_SAFETY_MARGIN 4096 > > /******************************************************************** >- Roundup a value to the nearest SMB_ROUNDUP_ALLOCATION_SIZE boundary. >- Only do this for Windows clients. >-********************************************************************/ >- >-SMB_BIG_UINT smb_roundup(SMB_BIG_UINT val) >-{ >- /* Only roundup for Windows clients. */ >- enum remote_arch_types ra_type = get_remote_arch(); >- if ((ra_type != RA_SAMBA) && (ra_type != RA_CIFSFS)) { >- val = SMB_ROUNDUP(val,SMB_ROUNDUP_ALLOCATION_SIZE); >- } >- return val; >-} >- >-/******************************************************************** > Given a stat buffer return the allocated size on disk, taking into > account sparse files. > ********************************************************************/ >@@ -65,8 +50,6 @@ > if (!ret && fsp && fsp->initial_allocation_size) > ret = fsp->initial_allocation_size; > >- ret = smb_roundup(ret); >- > return ret; > } > >@@ -3350,9 +3333,6 @@ > DEBUG(10,("call_trans2setfilepathinfo: Set file allocation info for file %s to %.0f\n", > fname, (double)allocation_size )); > >- if (allocation_size) >- allocation_size = smb_roundup(allocation_size); >- > if(allocation_size != get_file_size(sbuf)) { > SMB_STRUCT_STAT new_sbuf; > >Index: include/local.h >=================================================================== >--- include/local.h (revision 5547) >+++ include/local.h (working copy) >@@ -198,9 +198,6 @@ > /* the maximum age in seconds of a password. Should be a lp_ parameter */ > #define MAX_PASSWORD_AGE (21*24*60*60) > >-/* Allocation roundup. */ >-#define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000 >- > /* shall we deny oplocks to clients that get timeouts? */ > #define FASCIST_OPLOCK_BACKOFF 1 > >Index: include/smb_macros.h >=================================================================== >--- include/smb_macros.h (revision 5547) >+++ include/smb_macros.h (working copy) >@@ -178,8 +178,6 @@ > /* this is how errors are generated */ > #define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__) > >-#define SMB_ROUNDUP(x,r) ( ((x)%(r)) ? ( (((x)+(r))/(r))*(r) ) : (x)) >- > /* Extra macros added by Ying Chen at IBM - speed increase by inlining. */ > #define smb_buf(buf) (((char *)(buf)) + smb_size + CVAL(buf,smb_wct)*2) > #define smb_buflen(buf) (SVAL(buf,smb_vwv0 + (int)CVAL(buf, smb_wct)*2))
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 2146
: 981