Merge tag 'for-5.15/block-2021-08-30' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / fs / f2fs / namei.c

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index a9cd9cf..e149c8c 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -153,7 +153,8 @@ fail_drop:
        return ERR_PTR(err);
 }
 
-static inline int is_extension_exist(const unsigned char *s, const char *sub)
+static inline int is_extension_exist(const unsigned char *s, const char *sub,
+                                               bool tmp_ext)
 {
        size_t slen = strlen(s);
        size_t sublen = strlen(sub);
@@ -169,6 +170,13 @@ static inline int is_extension_exist(const unsigned char *s, const char *sub)
        if (slen < sublen + 2)
                return 0;
 
+       if (!tmp_ext) {
+               /* file has no temp extension */
+               if (s[slen - sublen - 1] != '.')
+                       return 0;
+               return !strncasecmp(s + slen - sublen, sub, sublen);
+       }
+
        for (i = 1; i < slen - sublen; i++) {
                if (s[i] != '.')
                        continue;
@@ -194,7 +202,7 @@ static inline void set_file_temperature(struct f2fs_sb_info *sbi, struct inode *
        hot_count = sbi->raw_super->hot_ext_count;
 
        for (i = 0; i < cold_count + hot_count; i++) {
-               if (is_extension_exist(name, extlist[i]))
+               if (is_extension_exist(name, extlist[i], true))
                        break;
        }
 
@@ -279,14 +287,16 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
                                                const unsigned char *name)
 {
        __u8 (*extlist)[F2FS_EXTENSION_LEN] = sbi->raw_super->extension_list;
-       unsigned char (*ext)[F2FS_EXTENSION_LEN];
-       unsigned int ext_cnt = F2FS_OPTION(sbi).compress_ext_cnt;
+       unsigned char (*noext)[F2FS_EXTENSION_LEN] = F2FS_OPTION(sbi).noextensions;
+       unsigned char (*ext)[F2FS_EXTENSION_LEN] = F2FS_OPTION(sbi).extensions;
+       unsigned char ext_cnt = F2FS_OPTION(sbi).compress_ext_cnt;
+       unsigned char noext_cnt = F2FS_OPTION(sbi).nocompress_ext_cnt;
        int i, cold_count, hot_count;
 
        if (!f2fs_sb_has_compression(sbi) ||
-                       is_inode_flag_set(inode, FI_COMPRESSED_FILE) ||
                        F2FS_I(inode)->i_flags & F2FS_NOCOMP_FL ||
-                       !f2fs_may_compress(inode))
+                       !f2fs_may_compress(inode) ||
+                       (!ext_cnt && !noext_cnt))
                return;
 
        down_read(&sbi->sb_lock);
@@ -295,7 +305,7 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
        hot_count = sbi->raw_super->hot_ext_count;
 
        for (i = cold_count; i < cold_count + hot_count; i++) {
-               if (is_extension_exist(name, extlist[i])) {
+               if (is_extension_exist(name, extlist[i], false)) {
                        up_read(&sbi->sb_lock);
                        return;
                }
@@ -303,10 +313,18 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode,
 
        up_read(&sbi->sb_lock);
 
-       ext = F2FS_OPTION(sbi).extensions;
+       for (i = 0; i < noext_cnt; i++) {
+               if (is_extension_exist(name, noext[i], false)) {
+                       f2fs_disable_compressed_file(inode);
+                       return;
+               }
+       }
+
+       if (is_inode_flag_set(inode, FI_COMPRESSED_FILE))
+               return;
 
        for (i = 0; i < ext_cnt; i++) {
-               if (!is_extension_exist(name, ext[i]))
+               if (!is_extension_exist(name, ext[i], false))
                        continue;
 
                set_compress_context(inode);