fs/ntfs3: Remove unused functions

Removed attr_must_be_resident and ntfs_query_def.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c
index b2f54fab40012c398daaf1d100cfca48ca8fe84d..7c00656151fb57e70571c14adf8da07429ca0299 100644 (file)
--- a/fs/ntfs3/attrib.c
+++ b/fs/ntfs3/attrib.c
@@ -54,33 +54,6 @@ static inline u64 get_pre_allocated(u64 size)
        return ret;
 }
 
-/*
- * attr_must_be_resident
- *
- * Return: True if attribute must be resident.
- */
-static inline bool attr_must_be_resident(struct ntfs_sb_info *sbi,
-                                        enum ATTR_TYPE type)
-{
-       const struct ATTR_DEF_ENTRY *de;
-
-       switch (type) {
-       case ATTR_STD:
-       case ATTR_NAME:
-       case ATTR_ID:
-       case ATTR_LABEL:
-       case ATTR_VOL_INFO:
-       case ATTR_ROOT:
-       case ATTR_EA_INFO:
-               return true;
-       default:
-               de = ntfs_query_def(sbi, type);
-               if (de && (de->flags & NTFS_ATTR_MUST_BE_RESIDENT))
-                       return true;
-               return false;
-       }
-}
-
 /*
  * attr_load_runs - Load all runs stored in @attr.
  */

diff --git a/fs/ntfs3/fsntfs.c b/fs/ntfs3/fsntfs.c
index f45520a0d539831e18315081e009082b63fb615c..b7c68ca65bac2f84c84bc6c964b64aa37c339ac4 100644 (file)
--- a/fs/ntfs3/fsntfs.c
+++ b/fs/ntfs3/fsntfs.c
@@ -345,35 +345,6 @@ out:
        return err;
 }
 
-/*
- * ntfs_query_def
- *
- * Return: Current ATTR_DEF_ENTRY for given attribute type.
- */
-const struct ATTR_DEF_ENTRY *ntfs_query_def(struct ntfs_sb_info *sbi,
-                                           enum ATTR_TYPE type)
-{
-       int type_in = le32_to_cpu(type);
-       size_t min_idx = 0;
-       size_t max_idx = sbi->def_entries - 1;
-
-       while (min_idx <= max_idx) {
-               size_t i = min_idx + ((max_idx - min_idx) >> 1);
-               const struct ATTR_DEF_ENTRY *entry = sbi->def_table + i;
-               int diff = le32_to_cpu(entry->type) - type_in;
-
-               if (!diff)
-                       return entry;
-               if (diff < 0)
-                       min_idx = i + 1;
-               else if (i)
-                       max_idx = i - 1;
-               else
-                       return NULL;
-       }
-       return NULL;
-}
-
 /*
  * ntfs_look_for_free_space - Look for a free space in bitmap.
  */

diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
index 070ede6bee1971e1b2406a0aa9ef47eba838be9c..6e23553104331798b425a3809422a7c71a05cbf5 100644 (file)
--- a/fs/ntfs3/ntfs_fs.h
+++ b/fs/ntfs3/ntfs_fs.h
@@ -585,8 +585,6 @@ int ntfs_fix_post_read(struct NTFS_RECORD_HEADER *rhdr, size_t bytes,
                       bool simple);
 int ntfs_extend_init(struct ntfs_sb_info *sbi);
 int ntfs_loadlog_and_replay(struct ntfs_inode *ni, struct ntfs_sb_info *sbi);
-const struct ATTR_DEF_ENTRY *ntfs_query_def(struct ntfs_sb_info *sbi,
-                                           enum ATTR_TYPE Type);
 int ntfs_look_for_free_space(struct ntfs_sb_info *sbi, CLST lcn, CLST len,
                             CLST *new_lcn, CLST *new_len,
                             enum ALLOCATE_OPT opt);