Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 6 insertions, 4 deletions

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index c55651f1407c..f3c820b75829 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -83,7 +83,7 @@ static void reiserfs_write_super(struct super_block *s)
         reiserfs_sync_fs(s, 1);
 }
 
-static void reiserfs_write_super_lockfs(struct super_block *s)
+static int reiserfs_freeze(struct super_block *s)
 {
         struct reiserfs_transaction_handle th;
         reiserfs_write_lock(s);
@@ -101,11 +101,13 @@ static void reiserfs_write_super_lockfs(struct super_block *s)
         }
         s->s_dirt = 0;
         reiserfs_write_unlock(s);
+        return 0;
 }
 
-static void reiserfs_unlockfs(struct super_block *s)
+static int reiserfs_unfreeze(struct super_block *s)
 {
         reiserfs_allow_writes(s);
+        return 0;
 }
 
 extern const struct in_core_key MAX_IN_CORE_KEY;
@@ -613,8 +615,8 @@ static const struct super_operations reiserfs_sops = {
         .put_super = reiserfs_put_super,
         .write_super = reiserfs_write_super,
         .sync_fs = reiserfs_sync_fs,
-        .write_super_lockfs = reiserfs_write_super_lockfs,
-        .unlockfs = reiserfs_unlockfs,
+        .freeze_fs = reiserfs_freeze,
+        .unfreeze_fs = reiserfs_unfreeze,
         .statfs = reiserfs_statfs,
         .remount_fs = reiserfs_remount,
         .show_options = generic_show_options,