Merge branch 'master' of /home/shaggy/git/linus-clean/

diff --combined fs/jfs/super.c
index 59e07c1,b37d1f7..6f21adf
--- 1/fs/jfs/super.c
--- 2/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@@ -29,7 -29,6 +29,7 @@@
  #include <linux/posix_acl.h>
  #include <linux/buffer_head.h>
  #include <linux/exportfs.h>
 +#include <linux/crc32.h>
  #include <asm/uaccess.h>
  #include <linux/seq_file.h>
  
@@@ -169,9 -168,6 +169,9 @@@ static int jfs_statfs(struct dentry *de
        buf->f_files = maxinodes;
        buf->f_ffree = maxinodes - (atomic_read(&imap->im_numinos) -
                                    atomic_read(&imap->im_numfree));
 +      buf->f_fsid.val[0] = (u32)crc32_le(0, sbi->uuid, sizeof(sbi->uuid)/2);
 +      buf->f_fsid.val[1] = (u32)crc32_le(0, sbi->uuid + sizeof(sbi->uuid)/2,
 +                                      sizeof(sbi->uuid)/2);
  
        buf->f_namelen = JFS_NAME_MAX;
        return 0;
@@@ -547,7 -543,7 +547,7 @@@ out_kfree
        return ret;
  }
  
- static void jfs_write_super_lockfs(struct super_block *sb)
+ static int jfs_freeze(struct super_block *sb)
  {
        struct jfs_sb_info *sbi = JFS_SBI(sb);
        struct jfs_log *log = sbi->log;
@@@ -557,9 -553,10 +557,10 @@@
                lmLogShutdown(log);
                updateSuper(sb, FM_CLEAN);
        }
+       return 0;
  }
  
- static void jfs_unlockfs(struct super_block *sb)
+ static int jfs_unfreeze(struct super_block *sb)
  {
        struct jfs_sb_info *sbi = JFS_SBI(sb);
        struct jfs_log *log = sbi->log;
@@@ -572,6 -569,7 +573,7 @@@
                else
                        txResume(sb);
        }
+       return 0;
  }
  
  static int jfs_get_sb(struct file_system_type *fs_type,
@@@ -739,8 -737,8 +741,8 @@@ static const struct super_operations jf
        .delete_inode   = jfs_delete_inode,
        .put_super      = jfs_put_super,
        .sync_fs        = jfs_sync_fs,
-       .write_super_lockfs = jfs_write_super_lockfs,
-       .unlockfs       = jfs_unlockfs,
+       .freeze_fs      = jfs_freeze,
+       .unfreeze_fs    = jfs_unfreeze,
        .statfs         = jfs_statfs,
        .remount_fs     = jfs_remount,
        .show_options   = jfs_show_options,