diff --git a/[refs] b/[refs] index 421ebe54fa31..e1f7171ebb90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a18546110ed6bec483d55bfffccb2487dfbd77af +refs/heads/master: 835417967c10b6dfaffdffddba59196196e5d431 diff --git a/trunk/fs/ext2/super.c b/trunk/fs/ext2/super.c index 8d6819846fc9..cb6f9bd658de 100644 --- a/trunk/fs/ext2/super.c +++ b/trunk/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; }