mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Solaris and Linux to use DEV_BSIZE as the value of m_uiBytesPerSector.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@556 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-06-13 15:38:44 +00:00
parent a518075826
commit 64c22eb9cd
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ftk/src/ftkunix.cpp
View File

@@ -128,7 +128,6 @@ RCODE F_FileHdl::openOrCreate(
char szSaveFileName[ F_PATH_MAX_SIZE];
int openFlags = O_RDONLY;
IF_FileSystem * pFileSystem = f_getFileSysPtr();
struct stat filestats;
#if defined( FLM_LINUX) || defined( FLM_SOLARIS) || defined( FLM_OSX)
bDoDirectIO = (uiAccess & FLM_IO_DIRECT) ? TRUE : FALSE;
@@ -257,14 +256,23 @@ Retry_Create:
directio( m_fd, DIRECTIO_ON);
}
#endif
if( fstat( m_fd, &filestats) != 0)
#if defined( FLM_SOLARIS) || defined( FLM_LINUX)
m_uiBytesPerSector = DEV_BSIZE;
#else
{
rc = f_mapPlatformError( errno, NE_FLM_OPENING_FILE);
goto Exit;
}
struct stat filestats;
m_uiBytesPerSector = (FLMUINT)filestats.st_blksize;
if( fstat( m_fd, &filestats) != 0)
{
rc = f_mapPlatformError( errno, NE_FLM_OPENING_FILE);
goto Exit;
}
m_uiBytesPerSector = (FLMUINT)filestats.st_blksize;
}
#endif
m_ui64NotOnSectorBoundMask = m_uiBytesPerSector - 1;
m_ui64GetSectorBoundMask = ~m_ui64NotOnSectorBoundMask;
m_bDoDirectIO = bDoDirectIO;