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

Commit e1740a46 authored by Al Viro's avatar Al Viro
Browse files

switch ext2 to simple_fsync() 



kill ext2_sync_file() (along with ext2/fsync.c), get rid of
ext2_update_inode() - it's an alias of ext2_write_inode().

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

fs/ext2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


obj-$(CONFIG_EXT2_FS) += ext2.o



ext2-y := balloc.o dir.o file.o fsync.o ialloc.o inode.o \

ext2-y := balloc.o dir.o file.o ialloc.o inode.o \

	  ioctl.o namei.o super.o symlink.o



ext2-$(CONFIG_EXT2_FS_XATTR)	 += xattr.o xattr_user.o xattr_trusted.o

fs/ext2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -720,5 +720,5 @@ const struct file_operations ext2_dir_operations = { 
#ifdef CONFIG_COMPAT

	.compat_ioctl	= ext2_compat_ioctl,

#endif

	.fsync		= ext2_sync_file,

	.fsync		= simple_fsync,

};

fs/ext2/ext2.h

+0 −3
Original line number Diff line number Diff line
@@ -113,9 +113,6 @@ extern int ext2_empty_dir (struct inode *); 
extern struct ext2_dir_entry_2 * ext2_dotdot (struct inode *, struct page **);

extern void ext2_set_link(struct inode *, struct ext2_dir_entry_2 *, struct page *, struct inode *);



/* fsync.c */

extern int ext2_sync_file (struct file *, struct dentry *, int);



/* ialloc.c */

extern struct inode * ext2_new_inode (struct inode *, int);

extern void ext2_free_inode (struct inode *);

fs/ext2/file.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ const struct file_operations ext2_file_operations = { 
	.mmap		= generic_file_mmap,

	.open		= generic_file_open,

	.release	= ext2_release_file,

	.fsync		= ext2_sync_file,

	.fsync		= simple_fsync,

	.splice_read	= generic_file_splice_read,

	.splice_write	= generic_file_splice_write,

};
@@ -72,7 +72,7 @@ const struct file_operations ext2_xip_file_operations = { 
	.mmap		= xip_file_mmap,

	.open		= generic_file_open,

	.release	= ext2_release_file,

	.fsync		= ext2_sync_file,

	.fsync		= simple_fsync,

};

#endif

fs/ext2/fsync.c

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

 *  linux/fs/ext2/fsync.c

 *

 *  Copyright (C) 1993  Stephen Tweedie (sct@dcs.ed.ac.uk)

 *  from

 *  Copyright (C) 1992  Remy Card (card@masi.ibp.fr)

 *                      Laboratoire MASI - Institut Blaise Pascal

 *                      Universite Pierre et Marie Curie (Paris VI)

 *  from

 *  linux/fs/minix/truncate.c   Copyright (C) 1991, 1992  Linus Torvalds

 * 

 *  ext2fs fsync primitive

 *

 *  Big-endian to little-endian byte-swapping/bitmaps by

 *        David S. Miller (davem@caip.rutgers.edu), 1995

 * 

 *  Removed unnecessary code duplication for little endian machines

 *  and excessive __inline__s. 

 *        Andi Kleen, 1997

 *

 * Major simplications and cleanup - we only need to do the metadata, because

 * we can depend on generic_block_fdatasync() to sync the data blocks.

 */



#include "ext2.h"

#include <linux/buffer_head.h>		/* for sync_mapping_buffers() */





/*

 *	File may be NULL when we are called. Perhaps we shouldn't

 *	even pass file to fsync ?

 */



int ext2_sync_file(struct file *file, struct dentry *dentry, int datasync)

{

	struct inode *inode = dentry->d_inode;

	int err;

	int ret;



	ret = sync_mapping_buffers(inode->i_mapping);

	if (!(inode->i_state & I_DIRTY))

		return ret;

	if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))

		return ret;



	err = ext2_sync_inode(inode);

	if (ret == 0)

		ret = err;

	return ret;

}