Substitute O_SYNC with O_FSYNC in block/raw-posix.c
PATCH 1/1 Substitute O_SYNC with O_FSYNC in block/raw-posix.c
This patch will allow the file block/raw-posix.c to compile on gcc 3.3 on Mac OS 10.3. Since the O_SYNC symbol is missing on this version of the Mac OS, O_FSYNC will be used in its place.
--- block/raw-posix.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
block/raw-posix.c +9 -0
@@ -79,6 +79,15 @@#define DEBUG_BLOCK_PRINT (formatCstr, ...)#endif +/* Mac OS less than 10.4 doesn't have O_SYNC */ +#ifndef O_SYNC +#ifdef O_FSYNC +#define O_SYNC O_FSYNC +#else +#define O_SYNC 0 +#endif +#endif +/* OS X does not have O_DSYNC */ #ifndef O_DSYNC #define O_DSYNC O_SYNC
Signature · 1 line
1.6.3.3
Quoted 3 lines · On Thu, Jun 25, 2009 at 08:59:35PM -0400, G 3 wrote:
This patch will allow the file
block/raw-posix.cto compile on gcc 3.3 on Mac OS 10.3. Since theO_SYNCsymbol is missing on this version of the Mac OS,O_FSYNCwill be used in its place.
Same comment about the zero as last time still applies. Also the look of this is really ugly as you just deinfe O_SYNC only for it to substitute for O_DSYNC a littler later, with two comments that together are rather confusing about macos..
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 Substitute O_DSYNC with O_SYNC or O_FSYNC when needed.
Quoted 18 lines · Christoph Hellwig
Quoted 4 lines · On Fri, Jun 26, 2009 at 03:02:47PM -0400, G 3 wrote:
/* OS X does not have
O_DSYNC*/
#ifndefO_DSYNC
#ifdefO_SYNC/* Works on Mac OS 10.4 and
greater */Quoted 8 lines
#define
O_DSYNCO_SYNC
#elifdefined(O_FSYNC)/* Works on Mac OS 10.3 and under */
#defineO_DSYNCO_FSYNC
#else /* If no substitute is
available */
#defineO_DSYNC0
#endif
#endifThis still does the NULL sync which can cause silent data loss if no O_*SYNC is available. If you want to be safe and support either
O_SYNCorO_FSYNCasO_DSYNCreplacement the following should be enough:
Quoted 13 lines
/*
* MacOS X does not haveO_DSYNC, and in earlier version noO_SYNC
either.
*/
#ifndefO_DSYNC
#ifdefO_SYNC
#defineO_DSYNCO_SYNC
#else
#defineO_DSYNCO_FSYNC
#endif
#endif
This patch should be what you want.
commit b32354139556d1a807d04aa54ed82610e0f4507a
Author: John Arbuckle <[email protected]> Date: Wed Jul 1 13:24:37 2009 -0400
Substitute O_DSYNC with O_SYNC or O_FSYNC when needed.
block/raw-posix.c +4 -0
@@ -81,7 +81,11 @@/* OS X does not have O_DSYNC */ #ifndef O_DSYNC +#ifdef O_SYNC #define O_DSYNC O_SYNC +#elif defined(O_FSYNC ) +#define O_DSYNC O_FSYNC +#endif #endif
[Qemu-devel] Re: [PATCH] Substitute O_DSYNC with O_SYNC or O_FSYNC when needed.
Quoted 9 lines · On Wed, Jul 01, 2009 at 01:28:32PM -0400, G 3 wrote:
This patch should be what you want.
commit
b32354139556d1a807d04aa54ed82610e0f4507aAuthor: John Arbuckle <[email protected]> Date: Wed Jul 1 13:24:37 2009 -0400Substitute
O_DSYNCwithO_SYNCorO_FSYNCwhen needed.Signed-off-by John Arbuckle <[email protected]>
Thanks, looks good to me,
Quoted 5 lines
block/raw-posix.c +0
-0
block/raw-posix.c line 89
Quoted 9 lines
block/raw-posix.c +4
-0@@ -81,7 +81,11 @@/* OS X does not have O_DSYNC */ #ifndef O_DSYNC +#ifdef O_SYNC #define O_DSYNC O_SYNC +#elif defined(O_FSYNC ) +#define O_DSYNC O_FSYNC +#endif #endif
---end quoted text---