From 42f93a47da0b124d497bf1bee1e886b3961541f0 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 7 Jun 2009 15:40:27 -0400
Subject: [PATCH] --- yaml --- r: 147871 b: refs/heads/master c:
 90de066443a8632bb42fed0a8216313d7da07aba h: refs/heads/master i:   147869:
 72d0ae6d3af98b36466e2365eca67d85bfd06d4c   147867:
 0ad4391dad4ade3cd802697ffb04073cfb5fe27c   147863:
 b8ec2e1241ccbf5fe5aa0119cb0bf141d8f8cb7a   147855:
 3213b310505d6571e0a381f65c2f0a0f8a90f17a   147839:
 00146c8b2dae24a869791535cff2b20d46ca2a8c v: v3

---
 [refs]                 |  2 +-
 trunk/fs/udf/Makefile  |  2 +-
 trunk/fs/udf/dir.c     |  2 +-
 trunk/fs/udf/file.c    |  2 +-
 trunk/fs/udf/fsync.c   | 52 ------------------------------------------
 trunk/fs/udf/udfdecl.h |  3 ---
 6 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 trunk/fs/udf/fsync.c

diff --git a/[refs] b/[refs]
index 027936c50c80..ba683f483982 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a932801543fe74050ebee07fde082234c46b624f
+refs/heads/master: 90de066443a8632bb42fed0a8216313d7da07aba
diff --git a/trunk/fs/udf/Makefile b/trunk/fs/udf/Makefile
index 0d4503f7446d..eb880f66c23a 100644
--- a/trunk/fs/udf/Makefile
+++ b/trunk/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/trunk/fs/udf/dir.c b/trunk/fs/udf/dir.c
index 2efd4d5291b6..61d9a76a3a69 100644
--- a/trunk/fs/udf/dir.c
+++ b/trunk/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/trunk/fs/udf/file.c b/trunk/fs/udf/file.c
index eb91f3b70320..7464305382b5 100644
--- a/trunk/fs/udf/file.c
+++ b/trunk/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/trunk/fs/udf/fsync.c b/trunk/fs/udf/fsync.c
deleted file mode 100644
index b2c472b733b8..000000000000
--- a/trunk/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/trunk/fs/udf/udfdecl.h b/trunk/fs/udf/udfdecl.h
index cac51b77a5d1..8d46f4294ee7 100644
--- a/trunk/fs/udf/udfdecl.h
+++ b/trunk/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 *,