sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s3: remove set_sparse_flag

Browse Source 
we need to determine sparseness from the sparse flag we store not from the
allocation size on the POSIX filesystem. This is how Windows works - in the
first place sparseness is a file flag, not the allocation state of the file

Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Björn Jacke 2010-11-18 17:03:01 +01:00 committed by Jeremy Allison
parent ebe5600615
commit 480042ddf9
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/smbd/dosmode.c
View File

@ -33,16 +33,6 @@ static uint32_t filter_mode_by_protocol(uint32_t mode)
return mode; return mode;
} }
static int set_sparse_flag(const SMB_STRUCT_STAT * const sbuf)
{
#if defined (HAVE_STAT_ST_BLOCKS) && defined(STAT_ST_BLOCKSIZE)
if (sbuf->st_ex_size > sbuf->st_ex_blocks * (SMB_OFF_T)STAT_ST_BLOCKSIZE) {
return FILE_ATTRIBUTE_SPARSE;
}
#endif
return 0;
}
static int set_link_read_only_flag(const SMB_STRUCT_STAT *const sbuf) static int set_link_read_only_flag(const SMB_STRUCT_STAT *const sbuf)
{ {
#ifdef S_ISLNK #ifdef S_ISLNK
@ -201,7 +191,6 @@ static uint32 dos_mode_from_sbuf(connection_struct *conn,
if (S_ISDIR(smb_fname->st.st_ex_mode)) if (S_ISDIR(smb_fname->st.st_ex_mode))
result = aDIR | (result & aRONLY); result = aDIR | (result & aRONLY);
result |= set_sparse_flag(&smb_fname->st);
result |= set_link_read_only_flag(&smb_fname->st); result |= set_link_read_only_flag(&smb_fname->st);
DEBUG(8,("dos_mode_from_sbuf returning ")); DEBUG(8,("dos_mode_from_sbuf returning "));
@ -560,7 +549,6 @@ static bool get_stat_dos_flags(connection_struct *conn,
if (S_ISDIR(smb_fname->st.st_ex_mode)) if (S_ISDIR(smb_fname->st.st_ex_mode))
*dosmode |= aDIR; *dosmode |= aDIR;
*dosmode |= set_sparse_flag(&smb_fname->st);
*dosmode |= set_link_read_only_flag(&smb_fname->st); *dosmode |= set_link_read_only_flag(&smb_fname->st);
return true; return true;
@ -653,9 +641,7 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
#endif #endif
if (!used_stat_dos_flags) { if (!used_stat_dos_flags) {
/* Get the DOS attributes from an EA by preference. */ /* Get the DOS attributes from an EA by preference. */
if (get_ea_dos_attribute(conn, smb_fname, &result)) { if (!get_ea_dos_attribute(conn, smb_fname, &result)) {
result |= set_sparse_flag(&smb_fname->st);
} else {
result |= dos_mode_from_sbuf(conn, smb_fname); result |= dos_mode_from_sbuf(conn, smb_fname);
} }
} }