Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

[linux-2.6-omap-h63xx.git] / fs / isofs / inode.c

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index c3240b42ebf55a5fa68024e771c460602b9e4753..26948a6033b69a71d82ba0b281c5efd7aa7dcec4 100644 (file)
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -73,7 +73,7 @@ static void isofs_destroy_inode(struct inode *inode)
        kmem_cache_free(isofs_inode_cachep, ISOFS_I(inode));
 }
 
-static void init_once(struct kmem_cache *cachep, void *foo)
+static void init_once(void *foo)
 {
        struct iso_inode_info *ei = foo;
 
@@ -110,6 +110,7 @@ static const struct super_operations isofs_sops = {
        .put_super      = isofs_put_super,
        .statfs         = isofs_statfs,
        .remount_fs     = isofs_remount,
+       .show_options   = generic_show_options,
 };
 
 
@@ -561,6 +562,8 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
        int table, error = -EINVAL;
        unsigned int vol_desc_start;
 
+       save_mount_options(s, data);
+
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
                return -ENOMEM;