---

yaml --- r: 147871 b: refs/heads/master c: 90de066 h: refs/heads/master i: 147869: 72d0ae6 147867: 0ad4391 147863: b8ec2e1 147855: 3213b31 147839: 00146c8 v: v3
git-mirror · Jun 12, 2009 · 42f93a4 · 42f93a4
1 parent d87b6ea
commit 42f93a4
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 59 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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 *,