switch udf to simple_fsync()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/udf/Makefile b/fs/udf/Makefile
index 0d4503f7446dcb5e8bb3a8441fd83537284de838..eb880f66c23a71f88f89de0ba0783f7e8250c20a 100644 (file)
--- a/fs/udf/Makefile
+++ b/fs/udf/Makefile
@@ -5,5 +5,5 @@
 obj-$(CONFIG_UDF_FS) += udf.o
 
 udf-objs     := balloc.o dir.o file.o ialloc.o inode.o lowlevel.o namei.o \
-               partition.o super.o truncate.o symlink.o fsync.o \
+               partition.o super.o truncate.o symlink.o \
                directory.o misc.o udftime.o unicode.o

diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 2efd4d5291b69cd8fb6c3be7ee020cd54d15f962..61d9a76a3a69dd109e3b3051e9bc89ddaa92990d 100644 (file)
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -210,5 +210,5 @@ const struct file_operations udf_dir_operations = {
        .read                   = generic_read_dir,
        .readdir                = udf_readdir,
        .ioctl                  = udf_ioctl,
-       .fsync                  = udf_fsync_file,
+       .fsync                  = simple_fsync,
 };

diff --git a/fs/udf/file.c b/fs/udf/file.c
index eb91f3b703201ec1669470ad5835a59a26de4b8f..7464305382b5e1d287cc6a435d1d60c077a0948d 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -209,7 +209,7 @@ const struct file_operations udf_file_operations = {
        .write                  = do_sync_write,
        .aio_write              = udf_file_aio_write,
        .release                = udf_release_file,
-       .fsync                  = udf_fsync_file,
+       .fsync                  = simple_fsync,
        .splice_read            = generic_file_splice_read,
        .llseek                 = generic_file_llseek,
 };

diff --git a/fs/udf/fsync.c b/fs/udf/fsync.c
deleted file mode 100644 (file)
index b2c472b..0000000
--- a/fs/udf/fsync.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * fsync.c
- *
- * PURPOSE
- *  Fsync handling routines for the OSTA-UDF(tm) filesystem.
- *
- * COPYRIGHT
- *  This file is distributed under the terms of the GNU General Public
- *  License (GPL). Copies of the GPL can be obtained from:
- *      ftp://prep.ai.mit.edu/pub/gnu/GPL
- *  Each contributing author retains all rights to their own work.
- *
- *  (C) 1999-2001 Ben Fennema
- *  (C) 1999-2000 Stelias Computing Inc
- *
- * HISTORY
- *
- *  05/22/99 blf  Created.
- */
-
-#include "udfdecl.h"
-
-#include <linux/fs.h>
-
-static int udf_fsync_inode(struct inode *, int);
-
-/*
- *     File may be NULL when we are called. Perhaps we shouldn't
- *     even pass file to fsync ?
- */
-
-int udf_fsync_file(struct file *file, struct dentry *dentry, int datasync)
-{
-       struct inode *inode = dentry->d_inode;
-
-       return udf_fsync_inode(inode, datasync);
-}
-
-static int udf_fsync_inode(struct inode *inode, int datasync)
-{
-       int err;
-
-       err = sync_mapping_buffers(inode->i_mapping);
-       if (!(inode->i_state & I_DIRTY))
-               return err;
-       if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
-               return err;
-
-       err |= udf_sync_inode(inode);
-
-       return err ? -EIO : 0;
-}

diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h
index cac51b77a5d165beaffb57032e3498363321f64e..8d46f4294ee740bd542b3ce1d8565c82c6df5bbb 100644 (file)
--- a/fs/udf/udfdecl.h
+++ b/fs/udf/udfdecl.h
@@ -223,9 +223,6 @@ extern int udf_prealloc_blocks(struct super_block *, struct inode *, uint16_t,
 extern int udf_new_block(struct super_block *, struct inode *, uint16_t,
                         uint32_t, int *);
 
-/* fsync.c */
-extern int udf_fsync_file(struct file *, struct dentry *, int);
-
 /* directory.c */
 extern struct fileIdentDesc *udf_fileident_read(struct inode *, loff_t *,
                                                struct udf_fileident_bh *,