diff mbox series

[2/5] jbd2: remove unused feature macros

Message ID 20230310125206.2867822-3-chengzhihao1@huawei.com
State New
Headers
Series ext4: Fix stale buffer loading from last failed |

Commit Message

Zhihao Cheng March 10, 2023, 12:52 p.m. UTC 
  From: Zhang Yi <yi.zhang@huawei.com>

JBD2_HAS_[IN|RO_]COMPAT_FEATURE macros are no longer used, just remove
them.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
---
 include/linux/jbd2.h | 11 -----------
 1 file changed, 11 deletions(-)

Comments

Jan Kara March 13, 2023, 10:52 a.m. UTC | #1 
On Fri 10-03-23 20:52:03, Zhihao Cheng wrote:
> From: Zhang Yi <yi.zhang@huawei.com>
> 
> JBD2_HAS_[IN|RO_]COMPAT_FEATURE macros are no longer used, just remove
> them.
> 
> Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
> Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
> ---
>  include/linux/jbd2.h | 11 -----------
>  1 file changed, 11 deletions(-)

Nice. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> 
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index 5962072a4b19..ad7bb6861143 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -274,17 +274,6 @@ typedef struct journal_superblock_s
>  /* 0x0400 */
>  } journal_superblock_t;
>  
> -/* Use the jbd2_{has,set,clear}_feature_* helpers; these will be removed */
> -#define JBD2_HAS_COMPAT_FEATURE(j,mask)					\
> -	((j)->j_format_version >= 2 &&					\
> -	 ((j)->j_superblock->s_feature_compat & cpu_to_be32((mask))))
> -#define JBD2_HAS_RO_COMPAT_FEATURE(j,mask)				\
> -	((j)->j_format_version >= 2 &&					\
> -	 ((j)->j_superblock->s_feature_ro_compat & cpu_to_be32((mask))))
> -#define JBD2_HAS_INCOMPAT_FEATURE(j,mask)				\
> -	((j)->j_format_version >= 2 &&					\
> -	 ((j)->j_superblock->s_feature_incompat & cpu_to_be32((mask))))
> -
>  #define JBD2_FEATURE_COMPAT_CHECKSUM		0x00000001
>  
>  #define JBD2_FEATURE_INCOMPAT_REVOKE		0x00000001
> -- 
> 2.31.1
>
diff mbox series

Patch

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 5962072a4b19..ad7bb6861143 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -274,17 +274,6 @@  typedef struct journal_superblock_s
 /* 0x0400 */
 } journal_superblock_t;
 
-/* Use the jbd2_{has,set,clear}_feature_* helpers; these will be removed */
-#define JBD2_HAS_COMPAT_FEATURE(j,mask)					\
-	((j)->j_format_version >= 2 &&					\
-	 ((j)->j_superblock->s_feature_compat & cpu_to_be32((mask))))
-#define JBD2_HAS_RO_COMPAT_FEATURE(j,mask)				\
-	((j)->j_format_version >= 2 &&					\
-	 ((j)->j_superblock->s_feature_ro_compat & cpu_to_be32((mask))))
-#define JBD2_HAS_INCOMPAT_FEATURE(j,mask)				\
-	((j)->j_format_version >= 2 &&					\
-	 ((j)->j_superblock->s_feature_incompat & cpu_to_be32((mask))))
-
 #define JBD2_FEATURE_COMPAT_CHECKSUM		0x00000001
 
 #define JBD2_FEATURE_INCOMPAT_REVOKE		0x00000001