diff options
author | Christoph Hellwig <hch@lst.de> | 2009-10-27 06:05:28 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2009-12-10 09:02:50 -0500 |
commit | 6b2f3d1f769be5779b479c37800229d9a4809fc3 (patch) | |
tree | 046ef6736ec6c25ab1c68741ba715d13645af336 /include/asm-generic | |
parent | 59bc055211b8d266ab6089158058bf8268e02006 (diff) |
vfs: Implement proper O_SYNC semantics
While Linux provided an O_SYNC flag basically since day 1, it took until
Linux 2.4.0-test12pre2 to actually get it implemented for filesystems,
since that day we had generic_osync_around with only minor changes and the
great "For now, when the user asks for O_SYNC, we'll actually give
O_DSYNC" comment. This patch intends to actually give us real O_SYNC
semantics in addition to the O_DSYNC semantics. After Jan's O_SYNC
patches which are required before this patch it's actually surprisingly
simple, we just need to figure out when to set the datasync flag to
vfs_fsync_range and when not.
This patch renames the existing O_SYNC flag to O_DSYNC while keeping it's
numerical value to keep binary compatibility, and adds a new real O_SYNC
flag. To guarantee backwards compatiblity it is defined as expanding to
both the O_DSYNC and the new additional binary flag (__O_SYNC) to make
sure we are backwards-compatible when compiled against the new headers.
This also means that all places that don't care about the differences can
just check O_DSYNC and get the right behaviour for O_SYNC, too - only
places that actuall care need to check __O_SYNC in addition. Drivers and
network filesystems have been updated in a fail safe way to always do the
full sync magic if O_DSYNC is set. The few places setting O_SYNC for
lower layers are kept that way for now to stay failsafe.
We enforce that O_DSYNC is set when __O_SYNC is set early in the open path
to make sure we always get these sane options.
Note that parisc really screwed up their headers as they already define a
O_DSYNC that has always been a no-op. We try to repair it by using it for
the new O_DSYNC and redefinining O_SYNC to send both the traditional
O_SYNC numerical value _and_ the O_DSYNC one.
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Grant Grundler <grundler@parisc-linux.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Dilger <adilger@sun.com>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Acked-by: Ulrich Drepper <drepper@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/fcntl.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index 495dc8af4044..681ddf3e844c 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h | |||
@@ -3,8 +3,6 @@ | |||
3 | 3 | ||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | 5 | ||
6 | /* open/fcntl - O_SYNC is only implemented on blocks devices and on files | ||
7 | located on an ext2 file system */ | ||
8 | #define O_ACCMODE 00000003 | 6 | #define O_ACCMODE 00000003 |
9 | #define O_RDONLY 00000000 | 7 | #define O_RDONLY 00000000 |
10 | #define O_WRONLY 00000001 | 8 | #define O_WRONLY 00000001 |
@@ -27,8 +25,8 @@ | |||
27 | #ifndef O_NONBLOCK | 25 | #ifndef O_NONBLOCK |
28 | #define O_NONBLOCK 00004000 | 26 | #define O_NONBLOCK 00004000 |
29 | #endif | 27 | #endif |
30 | #ifndef O_SYNC | 28 | #ifndef O_DSYNC |
31 | #define O_SYNC 00010000 | 29 | #define O_DSYNC 00010000 /* used to be O_SYNC, see below */ |
32 | #endif | 30 | #endif |
33 | #ifndef FASYNC | 31 | #ifndef FASYNC |
34 | #define FASYNC 00020000 /* fcntl, for BSD compatibility */ | 32 | #define FASYNC 00020000 /* fcntl, for BSD compatibility */ |
@@ -51,6 +49,25 @@ | |||
51 | #ifndef O_CLOEXEC | 49 | #ifndef O_CLOEXEC |
52 | #define O_CLOEXEC 02000000 /* set close_on_exec */ | 50 | #define O_CLOEXEC 02000000 /* set close_on_exec */ |
53 | #endif | 51 | #endif |
52 | |||
53 | /* | ||
54 | * Before Linux 2.6.32 only O_DSYNC semantics were implemented, but using | ||
55 | * the O_SYNC flag. We continue to use the existing numerical value | ||
56 | * for O_DSYNC semantics now, but using the correct symbolic name for it. | ||
57 | * This new value is used to request true Posix O_SYNC semantics. It is | ||
58 | * defined in this strange way to make sure applications compiled against | ||
59 | * new headers get at least O_DSYNC semantics on older kernels. | ||
60 | * | ||
61 | * This has the nice side-effect that we can simply test for O_DSYNC | ||
62 | * wherever we do not care if O_DSYNC or O_SYNC is used. | ||
63 | * | ||
64 | * Note: __O_SYNC must never be used directly. | ||
65 | */ | ||
66 | #ifndef O_SYNC | ||
67 | #define __O_SYNC 04000000 | ||
68 | #define O_SYNC (__O_SYNC|O_DSYNC) | ||
69 | #endif | ||
70 | |||
54 | #ifndef O_NDELAY | 71 | #ifndef O_NDELAY |
55 | #define O_NDELAY O_NONBLOCK | 72 | #define O_NDELAY O_NONBLOCK |
56 | #endif | 73 | #endif |