[PATCH] fs/reiserfs: remove unused macros

[PATCH] fs/reiserfs: remove unused macros

[Alex Shi]

these macros are never used from introduced. better to
remove them.

Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Andrew Morton <akpm@linux-foundation.org> 
Cc: Jan Kara <jack@suse.cz> 
Cc: Bharath Vedartham <linux.bhar@gmail.com> 
Cc: Hariprasad Kelam <hariprasad.kelam@gmail.com> 
Cc: Jason Yan <yanaijie@huawei.com> 
Cc: zhengbin <zhengbin13@huawei.com> 
Cc: Jia-Ju Bai <baijiaju1990@gmail.com> 
Cc: reiserfs-devel@vger.kernel.org 
Cc: linux-kernel@vger.kernel.org 
---
 fs/reiserfs/journal.c | 2 --
 fs/reiserfs/procfs.c  | 1 -
 fs/reiserfs/stree.c   | 6 ------
 3 files changed, 9 deletions(-)

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 4b3e3e73b512..072156c4f895 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -56,8 +56,6 @@
 /* gets a struct reiserfs_journal_list * from a list head */
 #define JOURNAL_LIST_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \
                                j_list))
-#define JOURNAL_WORK_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \
-                               j_working_list))
 
 /* must be correct to keep the desc and commit structs at 4k */
 #define JOURNAL_TRANS_HALF 1018
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index f2cf3441fdfc..ff336513c254 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -63,7 +63,6 @@ static int show_version(struct seq_file *m, void *unused)
 #define MAP( i ) D4C( objectid_map( sb, rs )[ i ] )
 
 #define DJF( x ) le32_to_cpu( rs -> x )
-#define DJV( x ) le32_to_cpu( s_v1 -> x )
 #define DJP( x ) le32_to_cpu( jp -> x )
 #define JF( x ) ( r -> s_journal -> x )
 
diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index da9ebe33882b..6051e7bbc221 100644
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -918,12 +918,6 @@ int comp_items(const struct item_head *stored_ih, const struct treepath *path)
 	return memcmp(stored_ih, ih, IH_SIZE);
 }
 
-/* unformatted nodes are not logged anymore, ever.  This is safe now */
-#define held_by_others(bh) (atomic_read(&(bh)->b_count) > 1)
-
-/* block can not be forgotten as it is in I/O or held by someone */
-#define block_in_use(bh) (buffer_locked(bh) || (held_by_others(bh)))
-
 /* prepare for delete or cut of direct item */
 static inline int prepare_for_direct_item(struct treepath *path,
 					  struct item_head *le_ih,
-- 
1.8.3.1

Re: [PATCH] fs/reiserfs: remove unused macros

[Jan Kara]

On Tue 21-01-20 18:25:38, Alex Shi wrote:
> these macros are never used from introduced. better to
> remove them.
> 
> Signed-off-by: Alex Shi <alex.shi@linux.alibaba.com>
> Cc: Andrew Morton <akpm@linux-foundation.org> 
> Cc: Jan Kara <jack@suse.cz> 
> Cc: Bharath Vedartham <linux.bhar@gmail.com> 
> Cc: Hariprasad Kelam <hariprasad.kelam@gmail.com> 
> Cc: Jason Yan <yanaijie@huawei.com> 
> Cc: zhengbin <zhengbin13@huawei.com> 
> Cc: Jia-Ju Bai <baijiaju1990@gmail.com> 
> Cc: reiserfs-devel@vger.kernel.org 
> Cc: linux-kernel@vger.kernel.org 

Thanks. I've added the patch to my tree.

								Honza

> ---
>  fs/reiserfs/journal.c | 2 --
>  fs/reiserfs/procfs.c  | 1 -
>  fs/reiserfs/stree.c   | 6 ------
>  3 files changed, 9 deletions(-)
> 
> diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
> index 4b3e3e73b512..072156c4f895 100644
> --- a/fs/reiserfs/journal.c
> +++ b/fs/reiserfs/journal.c
> @@ -56,8 +56,6 @@
>  /* gets a struct reiserfs_journal_list * from a list head */
>  #define JOURNAL_LIST_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \
>                                 j_list))
> -#define JOURNAL_WORK_ENTRY(h) (list_entry((h), struct reiserfs_journal_list, \
> -                               j_working_list))
>  
>  /* must be correct to keep the desc and commit structs at 4k */
>  #define JOURNAL_TRANS_HALF 1018
> diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
> index f2cf3441fdfc..ff336513c254 100644
> --- a/fs/reiserfs/procfs.c
> +++ b/fs/reiserfs/procfs.c
> @@ -63,7 +63,6 @@ static int show_version(struct seq_file *m, void *unused)
>  #define MAP( i ) D4C( objectid_map( sb, rs )[ i ] )
>  
>  #define DJF( x ) le32_to_cpu( rs -> x )
> -#define DJV( x ) le32_to_cpu( s_v1 -> x )
>  #define DJP( x ) le32_to_cpu( jp -> x )
>  #define JF( x ) ( r -> s_journal -> x )
>  
> diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
> index da9ebe33882b..6051e7bbc221 100644
> --- a/fs/reiserfs/stree.c
> +++ b/fs/reiserfs/stree.c
> @@ -918,12 +918,6 @@ int comp_items(const struct item_head *stored_ih, const struct treepath *path)
>  	return memcmp(stored_ih, ih, IH_SIZE);
>  }
>  
> -/* unformatted nodes are not logged anymore, ever.  This is safe now */
> -#define held_by_others(bh) (atomic_read(&(bh)->b_count) > 1)
> -
> -/* block can not be forgotten as it is in I/O or held by someone */
> -#define block_in_use(bh) (buffer_locked(bh) || (held_by_others(bh)))
> -
>  /* prepare for delete or cut of direct item */
>  static inline int prepare_for_direct_item(struct treepath *path,
>  					  struct item_head *le_ih,
> -- 
> 1.8.3.1
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR