[PATCH] xip: ext2: execute in place

These are the ext2 related parts.  Ext2 now uses the xip_* file operations
along with the get_xip_page aop when mounted with -o xip.

Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 26 insertions, 1 deletions

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 661c3d98d946..876e391f2871 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -31,6 +31,7 @@
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
+#include "xip.h"
 
 static void ext2_sync_super(struct super_block *sb,
                             struct ext2_super_block *es);
@@ -257,7 +258,7 @@ enum {
         Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
         Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro,
         Opt_nouid32, Opt_check, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh,
-        Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl,
+        Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl, Opt_xip,
         Opt_ignore, Opt_err,
 };
 
@@ -286,6 +287,7 @@ static match_table_t tokens = {
         {Opt_nouser_xattr, "nouser_xattr"},
         {Opt_acl, "acl"},
         {Opt_noacl, "noacl"},
+        {Opt_xip, "xip"},
         {Opt_ignore, "grpquota"},
         {Opt_ignore, "noquota"},
         {Opt_ignore, "quota"},
@@ -397,6 +399,13 @@ static int parse_options (char * options,
                         printk("EXT2 (no)acl options not supported\n");
                         break;
 #endif
+                case Opt_xip:
+#ifdef CONFIG_EXT2_FS_XIP
+                        set_opt (sbi->s_mount_opt, XIP);
+#else
+                        printk("EXT2 xip option not supported\n");
+#endif
+                        break;
                 case Opt_ignore:
                         break;
                 default:
@@ -640,6 +649,9 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
                 ((EXT2_SB(sb)->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 (le32_to_cpu(es->s_rev_level) == EXT2_GOOD_OLD_REV &&
             (EXT2_HAS_COMPAT_FEATURE(sb, ~0U) ||
              EXT2_HAS_RO_COMPAT_FEATURE(sb, ~0U) ||
@@ -668,6 +680,13 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
 
         blocksize = BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size);
 
+        if ((ext2_use_xip(sb)) && ((blocksize != PAGE_SIZE) ||
+                                  (sb->s_blocksize != blocksize))) {
+                if (!silent)
+                        printk("XIP: Unsupported blocksize\n");
+                goto failed_mount;
+        }
+
         /* If the blocksize doesn't match, re-read the thing.. */
         if (sb->s_blocksize != blocksize) {
                 brelse(bh);
@@ -916,6 +935,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
 {
         struct ext2_sb_info * sbi = EXT2_SB(sb);
         struct ext2_super_block * es;
+        unsigned long old_mount_opt = sbi->s_mount_opt;
 
         /*
          * Allow the "check" option to be passed as a remount option.
@@ -927,6 +947,11 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
                 ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
 
         es = sbi->s_es;
+        if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) !=
+            (old_mount_opt & EXT2_MOUNT_XIP)) &&
+            invalidate_inodes(sb))
+                ext2_warning(sb, __FUNCTION__, "busy inodes while remounting "\
+                             "xip remain in cache (no functional problem)");
         if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
                 return 0;
         if (*flags & MS_RDONLY) {