aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hfs
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2011-07-16 20:44:56 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 20:47:59 -0400
commit02c24a82187d5a628c68edfe71ae60dc135cd178 (patch)
treec8dbaba4d82e2b20ed4335910a564a1f7d90fcf6 /fs/hfs
parent22735068d53c7115e384bc88dea95b17e76a6839 (diff)
fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers
Btrfs needs to be able to control how filemap_write_and_wait_range() is called in fsync to make it less of a painful operation, so push down taking i_mutex and the calling of filemap_write_and_wait() down into the ->fsync() handlers. Some file systems can drop taking the i_mutex altogether it seems, like ext3 and ocfs2. For correctness sake I just pushed everything down in all cases to make sure that we keep the current behavior the same for everybody, and then each individual fs maintainer can make up their mind about what to do from there. Thanks, Acked-by: Jan Kara <jack@suse.cz> Signed-off-by: Josef Bacik <josef@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/hfs')
-rw-r--r--fs/hfs/inode.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 5e7c3f309617..96a1b625fc74 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -627,12 +627,18 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)
627 return 0; 627 return 0;
628} 628}
629 629
630static int hfs_file_fsync(struct file *filp, int datasync) 630static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end,
631 int datasync)
631{ 632{
632 struct inode *inode = filp->f_mapping->host; 633 struct inode *inode = filp->f_mapping->host;
633 struct super_block * sb; 634 struct super_block * sb;
634 int ret, err; 635 int ret, err;
635 636
637 ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
638 if (ret)
639 return ret;
640 mutex_lock(&inode->i_mutex);
641
636 /* sync the inode to buffers */ 642 /* sync the inode to buffers */
637 ret = write_inode_now(inode, 0); 643 ret = write_inode_now(inode, 0);
638 644
@@ -649,6 +655,7 @@ static int hfs_file_fsync(struct file *filp, int datasync)
649 err = sync_blockdev(sb->s_bdev); 655 err = sync_blockdev(sb->s_bdev);
650 if (!ret) 656 if (!ret)
651 ret = err; 657 ret = err;
658 mutex_unlock(&inode->i_mutex);
652 return ret; 659 return ret;
653} 660}
654 661