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

2 files changed, 55 insertions, 4 deletions

diff --git a/fs/jfs/Kconfig b/fs/jfs/Kconfig
new file mode 100644
index 000000000000..9ff619a6f9cc
--- /dev/null
+++ b/fs/jfs/Kconfig
@@ -0,0 +1,49 @@
+config JFS_FS
+        tristate "JFS filesystem support"
+        select NLS
+        help
+          This is a port of IBM's Journaled Filesystem .  More information is
+          available in the file <file:Documentation/filesystems/jfs.txt>.
+
+          If you do not intend to use the JFS filesystem, say N.
+
+config JFS_POSIX_ACL
+        bool "JFS POSIX Access Control Lists"
+        depends on JFS_FS
+        select FS_POSIX_ACL
+        help
+          Posix Access Control Lists (ACLs) support permissions for users and
+          groups beyond the owner/group/world scheme.
+
+          To learn more about Access Control Lists, visit the Posix ACLs for
+          Linux website <http://acl.bestbits.at/>.
+
+          If you don't know what Access Control Lists are, say N
+
+config JFS_SECURITY
+        bool "JFS Security Labels"
+        depends on JFS_FS
+        help
+          Security labels support alternative access control models
+          implemented by security modules like SELinux.  This option
+          enables an extended attribute handler for file security
+          labels in the jfs filesystem.
+
+          If you are not using a security module that requires using
+          extended attributes for file security labels, say N.
+
+config JFS_DEBUG
+        bool "JFS debugging"
+        depends on JFS_FS
+        help
+          If you are experiencing any problems with the JFS filesystem, say
+          Y here.  This will result in additional debugging messages to be
+          written to the system log.  Under normal circumstances, this
+          results in very little overhead.
+
+config JFS_STATISTICS
+        bool "JFS statistics"
+        depends on JFS_FS
+        help
+          Enabling this option will cause statistics from the JFS file system
+          to be made available to the user in the /proc/fs/jfs/ directory.
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 59e07c10319d..6f21adf9479a 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -547,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 +557,10 @@ static void jfs_write_super_lockfs(struct super_block *sb)
                 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 +573,7 @@ static void jfs_unlockfs(struct super_block *sb)
                 else
                         txResume(sb);
         }
+        return 0;
 }
 
 static int jfs_get_sb(struct file_system_type *fs_type,
@@ -739,8 +741,8 @@ static const struct super_operations jfs_super_operations = {
         .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,