Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90de0664 authored by Al Viro's avatar Al Viro
Browse files

switch udf to simple_fsync() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a9328015

fs/udf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

fs/udf/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

fs/udf/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

fs/udf/fsync.c

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/*

 * 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;

}

fs/udf/udfdecl.h

+0 −3
Original line number Diff line number Diff line
@@ -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 *,