mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 20:48:49 +08:00
hfsplus: simplify fsync
Remove lots of code we don't need from fsync, we just need to call ->write_inode on the inode if it's dirty, for which sync_inode_metadata is a lot more efficient than write_inode_now, and we need to write out the various metadata inodes, which we now do explicitly instead of by calling ->sync_fs. Signed-off-by: Christoph Hellwig <hch@tuxera.com>
This commit is contained in:
parent
f02e26f8d9
commit
281469766b
@ -302,29 +302,28 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int hfsplus_file_fsync(struct file *filp, int datasync)
|
||||
static int hfsplus_file_fsync(struct file *file, int datasync)
|
||||
{
|
||||
struct inode *inode = filp->f_mapping->host;
|
||||
struct super_block * sb;
|
||||
int ret, err;
|
||||
struct inode *inode = file->f_mapping->host;
|
||||
struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb);
|
||||
int error, error2;
|
||||
|
||||
/* sync the inode to buffers */
|
||||
ret = write_inode_now(inode, 0);
|
||||
/*
|
||||
* Sync inode metadata into the catalog and extent trees.
|
||||
*/
|
||||
sync_inode_metadata(inode, 1);
|
||||
|
||||
/* sync the superblock to buffers */
|
||||
sb = inode->i_sb;
|
||||
if (sb->s_dirt) {
|
||||
if (!(sb->s_flags & MS_RDONLY))
|
||||
hfsplus_sync_fs(sb, 1);
|
||||
else
|
||||
sb->s_dirt = 0;
|
||||
}
|
||||
|
||||
/* .. finally sync the buffers to disk */
|
||||
err = sync_blockdev(sb->s_bdev);
|
||||
if (!ret)
|
||||
ret = err;
|
||||
return ret;
|
||||
/*
|
||||
* And explicitly write out the btrees.
|
||||
*/
|
||||
error = filemap_write_and_wait(sbi->cat_tree->inode->i_mapping);
|
||||
error2 = filemap_write_and_wait(sbi->ext_tree->inode->i_mapping);
|
||||
if (!error)
|
||||
error = error2;
|
||||
error2 = filemap_write_and_wait(sbi->alloc_file->i_mapping);
|
||||
if (!error)
|
||||
error = error2;
|
||||
return error;
|
||||
}
|
||||
|
||||
static const struct inode_operations hfsplus_file_inode_operations = {
|
||||
|
Loading…
Reference in New Issue
Block a user