The patch titled
ext2: disallow setting xip on remount
has been removed from the -mm tree. Its filename was
set-xip-mount-option-on-ext2-bypass-check.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ext2: disallow setting xip on remount
From: Carsten Otte <cotte@xxxxxxxxxx>
Yan Zheng pointed out that ext2_remount lacks checking if -o xip should be
enabled or not. This patch checks for presence of direct_access on the
backing block device and if the blocksize meets the requirements.
Signed-off-by: Carsten Otte <cotte@xxxxxxxxxx>
Cc: Yan Zheng <yanzheng@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ext2/super.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff -puN fs/ext2/super.c~set-xip-mount-option-on-ext2-bypass-check fs/ext2/super.c
--- a/fs/ext2/super.c~set-xip-mount-option-on-ext2-bypass-check
+++ a/fs/ext2/super.c
@@ -1038,6 +1038,14 @@ static int ext2_remount (struct super_bl
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
+ ext2_xip_verify_sb(sb); /* see if bdev supports xip, unset
+ EXT2_MOUNT_XIP if not */
+
+ if ((ext2_use_xip(sb)) && (sb->s_blocksize != PAGE_SIZE)) {
+ printk("XIP: Unsupported blocksize\n");
+ goto restore_opts;
+ }
+
es = sbi->s_es;
if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) !=
(old_mount_opt & EXT2_MOUNT_XIP)) &&
_
Patches currently in -mm which might be from cotte@xxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
