summaryrefslogtreecommitdiffstats
path: root/fs/adfs/file.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-12 16:53:38 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-12 16:53:38 +1000
commitbc47ab0241c7c86da4f5e5f82fbca7d45387c18d (patch)
treeb9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42 /fs/adfs/file.c
parent37f9ef553bed630957e025504cdcbc76f5de49d5 (diff)
parent8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff)
downloadkernel-crypto-bc47ab0241c7c86da4f5e5f82fbca7d45387c18d.tar.gz
kernel-crypto-bc47ab0241c7c86da4f5e5f82fbca7d45387c18d.tar.xz
kernel-crypto-bc47ab0241c7c86da4f5e5f82fbca7d45387c18d.zip
Merge commit 'origin/master' into next
Manual merge of: arch/powerpc/kernel/asm-offsets.c
Diffstat (limited to 'fs/adfs/file.c')
-rw-r--r--fs/adfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/adfs/file.c b/fs/adfs/file.c
index 36e381c6a99..8224d54a2af 100644
--- a/fs/adfs/file.c
+++ b/fs/adfs/file.c
@@ -30,7 +30,7 @@ const struct file_operations adfs_file_operations = {
.read = do_sync_read,
.aio_read = generic_file_aio_read,
.mmap = generic_file_mmap,
- .fsync = file_fsync,
+ .fsync = simple_fsync,
.write = do_sync_write,
.aio_write = generic_file_aio_write,
.splice_read = generic_file_splice_read,