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 /drivers | |
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 'drivers')
-rw-r--r-- | drivers/char/mem.c | 6 | ||||
-rw-r--r-- | drivers/usb/gadget/file_storage.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 30eff80fed6f..fba76fb55abf 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
@@ -43,7 +43,7 @@ static inline int uncached_access(struct file *file, unsigned long addr) | |||
43 | { | 43 | { |
44 | #if defined(CONFIG_IA64) | 44 | #if defined(CONFIG_IA64) |
45 | /* | 45 | /* |
46 | * On ia64, we ignore O_SYNC because we cannot tolerate memory attribute aliases. | 46 | * On ia64, we ignore O_DSYNC because we cannot tolerate memory attribute aliases. |
47 | */ | 47 | */ |
48 | return !(efi_mem_attributes(addr) & EFI_MEMORY_WB); | 48 | return !(efi_mem_attributes(addr) & EFI_MEMORY_WB); |
49 | #elif defined(CONFIG_MIPS) | 49 | #elif defined(CONFIG_MIPS) |
@@ -56,9 +56,9 @@ static inline int uncached_access(struct file *file, unsigned long addr) | |||
56 | #else | 56 | #else |
57 | /* | 57 | /* |
58 | * Accessing memory above the top the kernel knows about or through a file pointer | 58 | * Accessing memory above the top the kernel knows about or through a file pointer |
59 | * that was marked O_SYNC will be done non-cached. | 59 | * that was marked O_DSYNC will be done non-cached. |
60 | */ | 60 | */ |
61 | if (file->f_flags & O_SYNC) | 61 | if (file->f_flags & O_DSYNC) |
62 | return 1; | 62 | return 1; |
63 | return addr >= __pa(high_memory); | 63 | return addr >= __pa(high_memory); |
64 | #endif | 64 | #endif |
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index 1e6aa504d58a..5e14dbaf65bc 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c | |||
@@ -1713,7 +1713,7 @@ static int do_write(struct fsg_dev *fsg) | |||
1713 | } | 1713 | } |
1714 | if (fsg->cmnd[1] & 0x08) { // FUA | 1714 | if (fsg->cmnd[1] & 0x08) { // FUA |
1715 | spin_lock(&curlun->filp->f_lock); | 1715 | spin_lock(&curlun->filp->f_lock); |
1716 | curlun->filp->f_flags |= O_SYNC; | 1716 | curlun->filp->f_flags |= O_DSYNC; |
1717 | spin_unlock(&curlun->filp->f_lock); | 1717 | spin_unlock(&curlun->filp->f_lock); |
1718 | } | 1718 | } |
1719 | } | 1719 | } |