[05/11] ocfs2: code cleanup: remove unused functions

Commit Message

Andrew Morton Jan. 24, 2014, 8:47 p.m. UTC

From: Goldwyn Rodrigues <[e-mail]>
Subject: ocfs2: code cleanup: remove unused functions

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

Signed-off-by: Goldwyn Rodrigues <[e-mail]>
Cc: Mark Fasheh <[e-mail]>
Cc: Joel Becker <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

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

Comments

Mark Fasheh Jan. 24, 2014, 10 p.m. UTC | #1

On Fri, Jan 24, 2014 at 12:47:04PM -0800, [e-mail] wrote:
> From: Goldwyn Rodrigues <[e-mail]>
> Subject: ocfs2: code cleanup: remove unused functions
> 
> These functions are either coded in individual files as static or not used
> at all.  Remove them.

NAK - some of this may be used by userspace (ocfs2_fs.h is shared with
ocfs2-tools).

The other reason for my NAK is that some of these either complete a set of
functions or provide information on how to handle structures:
ocfs2_gd_is_discontig or ocfs2_system_inode_is_global are good examples and
it's all in ocfs2_fs.h which is where I'd personally go look to see how the
fs structures are stored.
	--Mark

--
Mark Fasheh

Patch

diff -puN fs/ocfs2/ocfs2_fs.h~ocfs2-code-cleanup-remove-unused-functions fs/ocfs2/ocfs2_fs.h
--- a/fs/ocfs2/ocfs2_fs.h~ocfs2-code-cleanup-remove-unused-functions
+++ a/fs/ocfs2/ocfs2_fs.h
@@ -1325,16 +1325,6 @@  static inline int ocfs2_extent_recs_per_
 	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_
 	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_x
 #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(str
 	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 */