1 files changed, 20 insertions, 0 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 486a641ca71b..c63a18b574dd 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1518,10 +1518,14 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
                 set_opt(sbi->s_mount_opt, GRPID);
         if (def_mount_opts & EXT4_DEFM_UID16)
                 set_opt(sbi->s_mount_opt, NO_UID32);
+#ifdef CONFIG_EXT4DEV_FS_XATTR
         if (def_mount_opts & EXT4_DEFM_XATTR_USER)
                 set_opt(sbi->s_mount_opt, XATTR_USER);
+#endif
+#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
         if (def_mount_opts & EXT4_DEFM_ACL)
                 set_opt(sbi->s_mount_opt, POSIX_ACL);
+#endif
         if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_DATA)
                 sbi->s_mount_opt |= EXT4_MOUNT_JOURNAL_DATA;
         else if ((def_mount_opts & EXT4_DEFM_JMODE) == EXT4_DEFM_JMODE_ORDERED)
@@ -2419,6 +2423,22 @@ static int ext4_remount (struct super_block * sb, int * flags, char * data)
                                 err = -EROFS;
                                 goto restore_opts;
                         }
+
+                        /*
+                         * If we have an unprocessed orphan list hanging
+                         * around from a previously readonly bdev mount,
+                         * require a full umount/remount for now.
+                         */
+                        if (es->s_last_orphan) {
+                                printk(KERN_WARNING "EXT4-fs: %s: couldn't "
+                                       "remount RDWR because of unprocessed "
+                                       "orphan inode list.  Please "
+                                       "umount/remount instead.\n",
+                                       sb->s_id);
+                                err = -EINVAL;
+                                goto restore_opts;
+                        }
+
                         /*
                          * Mounting a RDONLY partition read-write, so reread
                          * and store the current valid flag.  (It may have