Commit a9328015 authored by Al Viro's avatar Al Viro

switch ufs to simple_fsync()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 05459ca8
...@@ -666,6 +666,6 @@ int ufs_empty_dir(struct inode * inode) ...@@ -666,6 +666,6 @@ int ufs_empty_dir(struct inode * inode)
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,
}; };
...@@ -24,31 +24,10 @@ ...@@ -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 = { ...@@ -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,
}; };
...@@ -99,7 +99,6 @@ extern void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de, ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment