ocfs2: Code cleanup: Removed unused functions

These functions are either coded in individual files as static or not used at all. Remove them.

Signed-off-by Goldwyn Rodrigues <[email protected]>

---
  fs/ocfs2/ocfs2_fs.h | 40 ----------------------------------------
  1 file changed, 40 deletions(-)

fs/ocfs2/ocfs2_fs.h +0 -40

index 938387a..3ba3851 100644
@@ -1325,16 +1325,6 @@ static inline int ocfs2_extent_recs_per_dx_root(struct super_block *sb)
  	return size / sizeof(struct ocfs2_extent_rec);
  }
 
-static inline int ocfs2_chain_recs_per_inode(struct super_block *sb)
-{
-	int size;
-
-	size = sb->s_blocksize -
-		offsetof(struct ocfs2_dinode, id2.i_chain.cl_recs);
-
-	return size / sizeof(struct ocfs2_chain_rec);
-}
-
  static inline u16 ocfs2_extent_recs_per_eb(struct super_block *sb)
  {
  	int size;

@@ -1493,16 +1483,6 @@ static inline int ocfs2_extent_recs_per_inode(int blocksize)
  	return size / sizeof(struct ocfs2_extent_rec);
  }
 
-static inline int ocfs2_chain_recs_per_inode(int blocksize)
-{
-	int size;
-
-	size = blocksize -
-		offsetof(struct ocfs2_dinode, id2.i_chain.cl_recs);
-
-	return size / sizeof(struct ocfs2_chain_rec);
-}
-
  static inline int ocfs2_extent_recs_per_eb(int blocksize)
  {
  	int size;

@@ -1589,12 +1569,6 @@ static inline int ocfs2_xattr_recs_per_xb(int blocksize)
  #endif  /* __KERNEL__ */
 
 
-static inline int ocfs2_system_inode_is_global(int type)
-{
-	return ((type >= 0) &&
-		(type <= OCFS2_LAST_GLOBAL_SYSTEM_INODE));
-}
-
  static inline int ocfs2_sprintf_system_inode_name(char *buf, int len,
  						  int type, int slot)
  {

@@ -1622,19 +1596,5 @@ static inline void ocfs2_set_de_type(struct ocfs2_dir_entry *de,
  	de->file_type = ocfs2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
  }
 
-static inline int ocfs2_gd_is_discontig(struct ocfs2_group_desc *gd)
-{
-	if ((offsetof(struct ocfs2_group_desc, bg_bitmap) +
-	     le16_to_cpu(gd->bg_size)) !=
-	    offsetof(struct ocfs2_group_desc, bg_list))
-		return 0;
-	/*
-	 * Only valid to check l_next_free_rec if
-	 * bg_bitmap + bg_size == bg_list.
-	 */
-	if (!gd->bg_list.l_next_free_rec)
-		return 0;
-	return 1;
-}
  #endif  /* _OCFS2_FS_H */
 

Hi Goldwyn,

I am not 100% sure ... but my understanding is ocfs2_fs.h defines metadata structures and helper functions. This file is shared between ocfs2-tools and kernel modules. The functions you mentioned are used by ocfs2-tools code and hence exist in this file.

Quoted 77 lines

These functions are either coded in individual files as static or not used at all. Remove them.

Signed-off-by Goldwyn Rodrigues <[email protected]>

---
  fs/ocfs2/ocfs2_fs.h | 40 ----------------------------------------
  1 file changed, 40 deletions(-)

fs/ocfs2/ocfs2_fs.h +0 -40

index 938387a..3ba3851 100644
@@ -1325,16 +1325,6 @@ static inline int
 ocfs2_extent_recs_per_dx_root(struct super_block *sb)
      return size / sizeof(struct ocfs2_extent_rec);
  }
-static inline int ocfs2_chain_recs_per_inode(struct super_block *sb)
-{
-    int size;
-
-    size = sb->s_blocksize -
-        offsetof(struct ocfs2_dinode, id2.i_chain.cl_recs);
-
-    return size / sizeof(struct ocfs2_chain_rec);
-}
-
  static inline u16 ocfs2_extent_recs_per_eb(struct super_block *sb)
  {
      int size;

@@ -1493,16 +1483,6 @@ static inline int
 ocfs2_extent_recs_per_inode(int blocksize)
      return size / sizeof(struct ocfs2_extent_rec);
  }
-static inline int ocfs2_chain_recs_per_inode(int blocksize)
-{
-    int size;
-
-    size = blocksize -
-        offsetof(struct ocfs2_dinode, id2.i_chain.cl_recs);
-
-    return size / sizeof(struct ocfs2_chain_rec);
-}
-
  static inline int ocfs2_extent_recs_per_eb(int blocksize)
  {
      int size;

@@ -1589,12 +1569,6 @@ static inline int ocfs2_xattr_recs_per_xb(int
 blocksize)
  #endif  /* __KERNEL__ */
-static inline int ocfs2_system_inode_is_global(int type)
-{
-    return ((type >= 0) &&
-        (type <= OCFS2_LAST_GLOBAL_SYSTEM_INODE));
-}
-
  static inline int ocfs2_sprintf_system_inode_name(char *buf, int len,
                            int type, int slot)
  {

@@ -1622,19 +1596,5 @@ static inline void ocfs2_set_de_type(struct
 ocfs2_dir_entry *de,
      de->file_type = ocfs2_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
  }
-static inline int ocfs2_gd_is_discontig(struct ocfs2_group_desc *gd)
-{
-    if ((offsetof(struct ocfs2_group_desc, bg_bitmap) +
-         le16_to_cpu(gd->bg_size)) !=
-        offsetof(struct ocfs2_group_desc, bg_list))
-        return 0;
-    /*
-     * Only valid to check l_next_free_rec if
-     * bg_bitmap + bg_size == bg_list.
-     */
-    if (!gd->bg_list.l_next_free_rec)
-        return 0;
-    return 1;
-}
  #endif  /* _OCFS2_FS_H */