Skip to contentSkip to conversation

fs/reiserfs: remove unused macros

PATCH In review Alex Shi 2 participants 2 messages Jan 21, 2020

lore
Share & tools
lore

Alex Shi

author
#0 lore raw

PATCH 1/1 fs/reiserfs: remove unused macros

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

Cc Andrew Morton <[email protected]>
Cc Jan Kara <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Hariprasad Kelam <[email protected]>
Cc Jason Yan <[email protected]>
Cc zhengbin <[email protected]>
Cc Jia-Ju Bai <[email protected]>
---
 fs/reiserfs/journal.c | 2 --
 fs/reiserfs/procfs.c  | 1 -
 fs/reiserfs/stree.c   | 6 ------
 3 files changed, 9 deletions(-)
fs/reiserfs/journal.c +0 -2
index 4b3e3e73b512..072156c4f895 100644
@@ -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
fs/reiserfs/procfs.c +0 -1
index f2cf3441fdfc..ff336513c254 100644
@@ -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 )
 
fs/reiserfs/stree.c +0 -6
index da9ebe33882b..6051e7bbc221 100644
@@ -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,
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 13 lines · Alex Shi

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

Cc Andrew Morton <[email protected]>
Cc Jan Kara <[email protected]>
Cc Bharath Vedartham <[email protected]>
Cc Hariprasad Kelam <[email protected]>
Cc Jason Yan <[email protected]>
Cc zhengbin <[email protected]>
Cc Jia-Ju Bai <[email protected]>

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

Honza

Quoted 51 lines
---
 fs/reiserfs/journal.c | 2 --
 fs/reiserfs/procfs.c  | 1 -
 fs/reiserfs/stree.c   | 6 ------
 3 files changed, 9 deletions(-)
fs/reiserfs/journal.c +0 -2
index 4b3e3e73b512..072156c4f895 100644
@@ -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
fs/reiserfs/procfs.c +0 -1
index f2cf3441fdfc..ff336513c254 100644
@@ -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 )
 
fs/reiserfs/stree.c +0 -6
index da9ebe33882b..6051e7bbc221 100644
@@ -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,
Signature · 1 line
1.8.3.1
Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR