diff options
| author | Björn Jacke <bj@sernet.de> | 2010-11-18 17:03:01 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-12-17 21:11:04 +0100 |
| commit | 480042ddf9f68bd89368c7373f71044b64b0f494 (patch) | |
| tree | f53c7c3512046ad3bbb25712bb55768434dda768 /source3/smbd/dosmode.c | |
| parent | ebe56006155b49a4a21a909a7bbdf7b9debc35b0 (diff) | |
| download | samba-480042ddf9f68bd89368c7373f71044b64b0f494.tar.gz samba-480042ddf9f68bd89368c7373f71044b64b0f494.tar.bz2 samba-480042ddf9f68bd89368c7373f71044b64b0f494.zip | |
s3: remove set_sparse_flag
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>
Diffstat (limited to 'source3/smbd/dosmode.c')
| -rw-r--r-- | source3/smbd/dosmode.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index ab0c2384c2..2fafb15c6e 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -33,16 +33,6 @@ static uint32_t filter_mode_by_protocol(uint32_t 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) { #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)) result = aDIR | (result & aRONLY); - result |= set_sparse_flag(&smb_fname->st); result |= set_link_read_only_flag(&smb_fname->st); 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)) *dosmode |= aDIR; - *dosmode |= set_sparse_flag(&smb_fname->st); *dosmode |= set_link_read_only_flag(&smb_fname->st); return true; @@ -653,9 +641,7 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname) #endif if (!used_stat_dos_flags) { /* Get the DOS attributes from an EA by preference. */ - if (get_ea_dos_attribute(conn, smb_fname, &result)) { - result |= set_sparse_flag(&smb_fname->st); - } else { + if (!get_ea_dos_attribute(conn, smb_fname, &result)) { result |= dos_mode_from_sbuf(conn, smb_fname); } } |