1 files changed, 20 insertions, 1 deletions

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 2a2e6ed9aab4..c1504c471fef 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1313,7 +1313,9 @@ struct ext4_super_block {
         __u8    s_first_error_time_hi;
         __u8    s_last_error_time_hi;
         __u8    s_pad[2];
-        __le32  s_reserved[96];         /* Padding to the end of the block */
+        __le16  s_encoding;             /* Filename charset encoding */
+        __le16  s_encoding_flags;       /* Filename charset encoding flags */
+        __le32  s_reserved[95];         /* Padding to the end of the block */
         __le32  s_checksum;             /* crc32c(superblock) */
 };
 
@@ -1338,6 +1340,16 @@ struct ext4_super_block {
 /* Number of quota types we support */
 #define EXT4_MAXQUOTAS 3
 
+#define EXT4_ENC_UTF8_12_1      1
+
+/*
+ * Flags for ext4_sb_info.s_encoding_flags.
+ */
+#define EXT4_ENC_STRICT_MODE_FL (1 << 0)
+
+#define ext4_has_strict_mode(sbi) \
+        (sbi->s_encoding_flags & EXT4_ENC_STRICT_MODE_FL)
+
 /*
  * fourth extended-fs super-block data in memory
  */
@@ -1387,6 +1399,10 @@ struct ext4_sb_info {
         struct kobject s_kobj;
         struct completion s_kobj_unregister;
         struct super_block *s_sb;
+#ifdef CONFIG_UNICODE
+        struct unicode_map *s_encoding;
+        __u16 s_encoding_flags;
+#endif
 
         /* Journaling */
         struct journal_s *s_journal;
@@ -1660,6 +1676,7 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei)
 #define EXT4_FEATURE_INCOMPAT_LARGEDIR          0x4000 /* >2GB or 3-lvl htree */
 #define EXT4_FEATURE_INCOMPAT_INLINE_DATA       0x8000 /* data in inode */
 #define EXT4_FEATURE_INCOMPAT_ENCRYPT           0x10000
+#define EXT4_FEATURE_INCOMPAT_CASEFOLD          0x20000
 
 extern void ext4_update_dynamic_rev(struct super_block *sb);
 
@@ -1753,6 +1770,7 @@ EXT4_FEATURE_INCOMPAT_FUNCS(csum_seed,		CSUM_SEED)
 EXT4_FEATURE_INCOMPAT_FUNCS(largedir,           LARGEDIR)
 EXT4_FEATURE_INCOMPAT_FUNCS(inline_data,        INLINE_DATA)
 EXT4_FEATURE_INCOMPAT_FUNCS(encrypt,            ENCRYPT)
+EXT4_FEATURE_INCOMPAT_FUNCS(casefold,           CASEFOLD)
 
 #define EXT2_FEATURE_COMPAT_SUPP        EXT4_FEATURE_COMPAT_EXT_ATTR
 #define EXT2_FEATURE_INCOMPAT_SUPP      (EXT4_FEATURE_INCOMPAT_FILETYPE| \
@@ -1780,6 +1798,7 @@ EXT4_FEATURE_INCOMPAT_FUNCS(encrypt,		ENCRYPT)
                                          EXT4_FEATURE_INCOMPAT_MMP | \
                                          EXT4_FEATURE_INCOMPAT_INLINE_DATA | \
                                          EXT4_FEATURE_INCOMPAT_ENCRYPT | \
+                                         EXT4_FEATURE_INCOMPAT_CASEFOLD | \
                                          EXT4_FEATURE_INCOMPAT_CSUM_SEED | \
                                          EXT4_FEATURE_INCOMPAT_LARGEDIR)
 #define EXT4_FEATURE_RO_COMPAT_SUPP     (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \