Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

switch ufs to simple_fsync()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro a9328015 05459ca8

+2 -24
+1 -1
fs/ufs/dir.c
··· 666 666 const struct file_operations ufs_dir_operations = { 667 667 .read = generic_read_dir, 668 668 .readdir = ufs_readdir, 669 - .fsync = ufs_sync_file, 669 + .fsync = simple_fsync, 670 670 .llseek = generic_file_llseek, 671 671 };
+1 -22
fs/ufs/file.c
··· 24 24 */ 25 25 26 26 #include <linux/fs.h> 27 - #include <linux/buffer_head.h> /* for sync_mapping_buffers() */ 28 27 29 28 #include "ufs_fs.h" 30 29 #include "ufs.h" 31 - 32 - 33 - int ufs_sync_file(struct file *file, struct dentry *dentry, int datasync) 34 - { 35 - struct inode *inode = dentry->d_inode; 36 - int err; 37 - int ret; 38 - 39 - ret = sync_mapping_buffers(inode->i_mapping); 40 - if (!(inode->i_state & I_DIRTY)) 41 - return ret; 42 - if (datasync && !(inode->i_state & I_DIRTY_DATASYNC)) 43 - return ret; 44 - 45 - err = ufs_sync_inode(inode); 46 - if (ret == 0) 47 - ret = err; 48 - return ret; 49 - } 50 - 51 30 52 31 /* 53 32 * We have mostly NULL's here: the current defaults are ok for ··· 41 62 .aio_write = generic_file_aio_write, 42 63 .mmap = generic_file_mmap, 43 64 .open = generic_file_open, 44 - .fsync = ufs_sync_file, 65 + .fsync = simple_fsync, 45 66 .splice_read = generic_file_splice_read, 46 67 };
-1
fs/ufs/ufs.h
··· 99 99 extern const struct inode_operations ufs_file_inode_operations; 100 100 extern const struct file_operations ufs_file_operations; 101 101 extern const struct address_space_operations ufs_aops; 102 - extern int ufs_sync_file(struct file *, struct dentry *, int); 103 102 104 103 /* ialloc.c */ 105 104 extern void ufs_free_inode (struct inode *inode);