From 7660d4e5b528b7deee6e767a957c2a710107522c Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Fri, 8 Feb 2008 04:21:46 -0800 Subject: [PATCH] --- yaml --- r: 84799 b: refs/heads/master c: d0132eea7a295623e34e26b0977638cc0f62a2c6 h: refs/heads/master i: 84797: 1638e9726e6004049e00677731d3163d4ede4822 84795: 74d0c680039a28f0d8a50d222e32931396e7c58e 84791: 40302f12b227ee26890dd983b98b89f354e4d099 84783: 110e2f0690a6df0109b629840d5efaf2f839f422 84767: 7c37f7515cfd111e433cbd6923fba3e09cbb6a85 84735: 73d5043265e774ea0d4dfc92b7e1b4e6780f991d v: v3 --- [refs] | 2 +- trunk/fs/isofs/inode.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9b3e3e4fc98d..2047b391cca1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10f19a86a5e106edb86d354137ba6e7388ecd1ce +refs/heads/master: d0132eea7a295623e34e26b0977638cc0f62a2c6 diff --git a/trunk/fs/isofs/inode.c b/trunk/fs/isofs/inode.c index c3240b42ebf5..044a254d526b 100644 --- a/trunk/fs/isofs/inode.c +++ b/trunk/fs/isofs/inode.c @@ -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;