From 8ac257f20ffbab936b20a2d20201c7b9a0737e9a Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 8 Jun 2009 10:05:12 +0200 Subject: [PATCH] --- yaml --- r: 147883 b: refs/heads/master c: 7fbc6df0e7a561a313f49faa77829d5de45a97f8 h: refs/heads/master i: 147881: c6c4dbf74cf4c1da4d31d35d1bd150dc09fecbf4 147879: ac8a6d049cec783edd687980bc0c288f31c12d15 v: v3 --- [refs] | 2 +- trunk/fs/hfsplus/super.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9a158c81a0e2..9bbbfacfbdcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58bc5bbb873eb5d86126a3fd3ff02aaa69ec15d0 +refs/heads/master: 7fbc6df0e7a561a313f49faa77829d5de45a97f8 diff --git a/trunk/fs/hfsplus/super.c b/trunk/fs/hfsplus/super.c index 1aab8aa7801e..9fc3af0c0dab 100644 --- a/trunk/fs/hfsplus/super.c +++ b/trunk/fs/hfsplus/super.c @@ -152,7 +152,7 @@ static void hfsplus_clear_inode(struct inode *inode) } } -static void hfsplus_write_super(struct super_block *sb) +static int hfsplus_sync_fs(struct super_block *sb, int wait) { struct hfsplus_vh *vhdr = HFSPLUS_SB(sb).s_vhdr; @@ -160,9 +160,6 @@ static void hfsplus_write_super(struct super_block *sb) lock_super(sb); sb->s_dirt = 0; - if (sb->s_flags & MS_RDONLY) - /* warn? */ - goto out; vhdr->free_blocks = cpu_to_be32(HFSPLUS_SB(sb).free_blocks); vhdr->next_alloc = cpu_to_be32(HFSPLUS_SB(sb).next_alloc); @@ -194,8 +191,16 @@ static void hfsplus_write_super(struct super_block *sb) } HFSPLUS_SB(sb).flags &= ~HFSPLUS_SB_WRITEBACKUP; } - out: unlock_super(sb); + return 0; +} + +static void hfsplus_write_super(struct super_block *sb) +{ + if (!(sb->s_flags & MS_RDONLY)) + hfsplus_sync_fs(sb, 1); + else + sb->s_dirt = 0; } static void hfsplus_put_super(struct super_block *sb) @@ -290,6 +295,7 @@ static const struct super_operations hfsplus_sops = { .clear_inode = hfsplus_clear_inode, .put_super = hfsplus_put_super, .write_super = hfsplus_write_super, + .sync_fs = hfsplus_sync_fs, .statfs = hfsplus_statfs, .remount_fs = hfsplus_remount, .show_options = hfsplus_show_options,