summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@tuxera.com>2010-11-23 14:38:06 +0100
committerChristoph Hellwig <hch@lst.de>2010-11-23 14:38:06 +0100
commit281469766bdde2d14bc73e1fec347e6dd7f63319 (patch)
tree32b00c29067aa60fc7ad3277816bd86900a1c81d /fs
parentf02e26f8d90f8cde98314c72c2e890bc281a8346 (diff)
downloadlinux-stable-281469766bdde2d14bc73e1fec347e6dd7f63319.tar.gz
linux-stable-281469766bdde2d14bc73e1fec347e6dd7f63319.tar.bz2
linux-stable-281469766bdde2d14bc73e1fec347e6dd7f63319.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/hfsplus/inode.c41
1 files changed, 20 insertions, 21 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 8afd7e84f98d..be68961da997 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -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;
-
- /* sync the inode to buffers */
- ret = write_inode_now(inode, 0);
-
- /* 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;
- }
+ struct inode *inode = file->f_mapping->host;
+ struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb);
+ int error, error2;
- /* .. finally sync the buffers to disk */
- err = sync_blockdev(sb->s_bdev);
- if (!ret)
- ret = err;
- return ret;
+ /*
+ * Sync inode metadata into the catalog and extent trees.
+ */
+ sync_inode_metadata(inode, 1);
+
+ /*
+ * 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 = {