diff options
Diffstat (limited to 'fs/ufs/file.c')
| -rw-r--r-- | fs/ufs/file.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/fs/ufs/file.c b/fs/ufs/file.c index a9c6e5f04fa..c84ec010a67 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c @@ -24,27 +24,9 @@ */ #include <linux/fs.h> -#include <linux/ufs_fs.h> -#include <linux/buffer_head.h> /* for sync_mapping_buffers() */ - -static 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; -} +#include "ufs_fs.h" +#include "ufs.h" /* * We have mostly NULL's here: the current defaults are ok for @@ -53,10 +35,12 @@ static int ufs_sync_file(struct file *file, struct dentry *dentry, int datasync) const struct file_operations ufs_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = new_sync_read, + .read_iter = generic_file_read_iter, + .write = new_sync_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = generic_file_open, - .fsync = ufs_sync_file, - .sendfile = generic_file_sendfile, + .fsync = generic_file_fsync, + .splice_read = generic_file_splice_read, }; |