Prechádzať zdrojové kódy

switch ufs to simple_fsync()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 16 rokov pred
rodič
commit
a932801543
3 zmenil súbory, kde vykonal 2 pridanie a 24 odobranie
  1. 1 1
      fs/ufs/dir.c
  2. 1 22
      fs/ufs/file.c
  3. 0 1
      fs/ufs/ufs.h

+ 1 - 1
fs/ufs/dir.c

@@ -666,6 +666,6 @@ not_empty:
 const struct file_operations ufs_dir_operations = {
 const struct file_operations ufs_dir_operations = {
 	.read		= generic_read_dir,
 	.read		= generic_read_dir,
 	.readdir	= ufs_readdir,
 	.readdir	= ufs_readdir,
-	.fsync		= ufs_sync_file,
+	.fsync		= simple_fsync,
 	.llseek		= generic_file_llseek,
 	.llseek		= generic_file_llseek,
 };
 };

+ 1 - 22
fs/ufs/file.c

@@ -24,31 +24,10 @@
  */
  */
 
 
 #include <linux/fs.h>
 #include <linux/fs.h>
-#include <linux/buffer_head.h>	/* for sync_mapping_buffers() */
 
 
 #include "ufs_fs.h"
 #include "ufs_fs.h"
 #include "ufs.h"
 #include "ufs.h"
 
 
-
-int ufs_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 = ufs_sync_inode(inode);
-	if (ret == 0)
-		ret = err;
-	return ret;
-}
-
-
 /*
 /*
  * We have mostly NULL's here: the current defaults are ok for
  * We have mostly NULL's here: the current defaults are ok for
  * the ufs filesystem.
  * the ufs filesystem.
@@ -62,6 +41,6 @@ const struct file_operations ufs_file_operations = {
 	.aio_write	= generic_file_aio_write,
 	.aio_write	= generic_file_aio_write,
 	.mmap		= generic_file_mmap,
 	.mmap		= generic_file_mmap,
 	.open           = generic_file_open,
 	.open           = generic_file_open,
-	.fsync		= ufs_sync_file,
+	.fsync		= simple_fsync,
 	.splice_read	= generic_file_splice_read,
 	.splice_read	= generic_file_splice_read,
 };
 };

+ 0 - 1
fs/ufs/ufs.h

@@ -99,7 +99,6 @@ extern void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,
 extern const struct inode_operations ufs_file_inode_operations;
 extern const struct inode_operations ufs_file_inode_operations;
 extern const struct file_operations ufs_file_operations;
 extern const struct file_operations ufs_file_operations;
 extern const struct address_space_operations ufs_aops;
 extern const struct address_space_operations ufs_aops;
-extern int ufs_sync_file(struct file *, struct dentry *, int);
 
 
 /* ialloc.c */
 /* ialloc.c */
 extern void ufs_free_inode (struct inode *inode);
 extern void ufs_free_inode (struct inode *inode);