From: Oliver Kurth Date: Fri, 15 Sep 2017 18:23:30 +0000 (-0700) Subject: Remove FileIO_GetVolumeSectorSize X-Git-Tag: stable-10.2.0~297 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8afe56f5d1d33593d29b0247b0be5e2eba65d0a4;p=thirdparty%2Fopen-vm-tools.git Remove FileIO_GetVolumeSectorSize --- diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c index 43031a56b..d85812af0 100644 --- a/open-vm-tools/lib/file/fileIOPosix.c +++ b/open-vm-tools/lib/file/fileIOPosix.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 1998-2016 VMware, Inc. All rights reserved. + * Copyright (C) 1998-2017 VMware, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -454,36 +454,6 @@ FileIO_CreateFDPosix(int posix, // IN: UNIX file descriptor } -/* - *---------------------------------------------------------------------- - * - * FileIO_GetVolumeSectorSize -- - * - * Get sector size of underlying volume. - * - * Results: - * Always 512, there does not seem to be a way to query sectorSize - * from filename. But O_DIRECT boundary alignment constraint is - * always 512, so use that. - * - * Side effects: - * None - * - *---------------------------------------------------------------------- - */ - -Bool -FileIO_GetVolumeSectorSize(const char *pathName, // IN: - uint32 *sectorSize) // OUT: -{ - ASSERT(sectorSize != NULL); - - *sectorSize = 512; - - return TRUE; -} - - #if defined(__APPLE__) /* *---------------------------------------------------------------------- diff --git a/open-vm-tools/lib/include/fileIO.h b/open-vm-tools/lib/include/fileIO.h index 46ddec01d..00e1d9eb3 100644 --- a/open-vm-tools/lib/include/fileIO.h +++ b/open-vm-tools/lib/include/fileIO.h @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 1998-2016 VMware, Inc. All rights reserved. + * Copyright (C) 1998-2017 VMware, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -417,8 +417,10 @@ FileIOResult FileIO_CloseAndUnlink(FileIODescriptor *file); uint32 FileIO_GetFlags(FileIODescriptor *file); +#if defined(_WIN32) Bool FileIO_GetVolumeSectorSize(const char *name, uint32 *sectorSize); +#endif Bool FileIO_SupportsFileSize(const FileIODescriptor *file, uint64 testSize);