summaryrefslogtreecommitdiffstats
path: root/fs/ext2/super.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 06:58:59 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 06:58:59 +0100
commitcac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch)
tree73cd85e5529a01fa2338ab6d58b99c36dd666cbe /fs/ext2/super.c
parent[libata sata_mv] do not enable PCI MSI by default (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
downloadlinux-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.tar.xz
linux-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.zip
Merge branch 'master'
Diffstat (limited to 'fs/ext2/super.c')
-rw-r--r--fs/ext2/super.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 8d6819846fc9..cb6f9bd658de 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -221,6 +221,11 @@ static int ext2_show_options(struct seq_file *seq, struct vfsmount *vfs)
seq_puts(seq, ",grpquota");
#endif
+#if defined(CONFIG_EXT2_FS_XIP)
+ if (sbi->s_mount_opt & EXT2_MOUNT_XIP)
+ seq_puts(seq, ",xip");
+#endif
+
return 0;
}