btrfs: remove unused macros in ctree.h
PATCH 1/1 btrfs: remove unused macros in ctree.h
The Private2 #ifdefs in ctree.h for pages are no longer used, as of commit d71b53c3cb0a. Remove them, and update the comment to be about folios.
--- fs/btrfs/ctree.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
fs/btrfs/ctree.h +2 -5
@@ -744,14 +744,11 @@ const char *btrfs_super_csum_driver(u16 csum_type); size_t __attribute_const__ btrfs_get_num_csums(void);/* -* We use page status Private2 to indicate there is an ordered extent with +* We use folio status private_2 to indicate there is an ordered extent with * unfinished IO. * -* Rename the Private2 accessors to Ordered, to improve readability. +* Rename the private_2 accessors to ordered, to improve readability. */ -#define PageOrdered (page) PagePrivate2(page) -#define SetPageOrdered (page) SetPagePrivate2(page) -#define ClearPageOrdered (page) ClearPagePrivate2(page)#define folio_test_ordered (folio) folio_test_private_2(folio)#define folio_set_ordered (folio) folio_set_private_2(folio)#define folio_clear_ordered (folio) folio_clear_private_2(folio)
Signature · 1 line
2.45.2
Quoted 19 lines · Mark Harmstone
The Private2 #ifdefs in
ctree.hfor pages are no longer used, as of commitd71b53c3cb0a. Remove them, and update the comment to be about folios.Signed-off-by Mark Harmstone <[email protected]>--- fs/btrfs/ctree.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)fs/btrfs/ctree.h +1
-1@@ -744,14 +744,11 @@ const char *btrfs_super_csum_driver(u16 csum_type); size_t __attribute_const__ btrfs_get_num_csums(void);/* -* We use page status Private2 to indicate there is an ordered extent with +* We use folio status private_2 to indicate there is an ordered extent with * unfinished IO.
fs/btrfs/ctree.h const char *btrfs_super_csum_driver(u16 csum_type); · line 754
Quoted 10 lines
fs/btrfs/ctree.h +1
-4* -* Rename the Private2 accessors to Ordered, to improve readability. +* Rename the private_2 accessors to ordered, to improve readability. */ -#define PageOrdered (page) PagePrivate2(page) -#define SetPageOrdered (page) SetPagePrivate2(page) -#define ClearPageOrdered (page) ClearPagePrivate2(page)#define folio_test_ordered (folio) folio_test_private_2(folio)#define folio_set_ordered (folio) folio_set_private_2(folio)#define folio_clear_ordered (folio) folio_clear_private_2(folio)
While this is right, there's a patch (now in linux-next)
https://lore.kernel.org/all/[email protected]/
that removes that (with some other updates).
Ah, ignore this then. Thanks David
Quoted 35 lines · David Sterba
Quoted 1 line
Quoted 19 lines · Mark Harmstone
The Private2 #ifdefs in
ctree.hfor pages are no longer used, as of commitd71b53c3cb0a. Remove them, and update the comment to be about folios.Signed-off-by Mark Harmstone <[email protected]>--- fs/btrfs/ctree.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)fs/btrfs/ctree.h +1
-1@@ -744,14 +744,11 @@ const char *btrfs_super_csum_driver(u16 csum_type); size_t __attribute_const__ btrfs_get_num_csums(void);/* -* We use page status Private2 to indicate there is an ordered extent with +* We use folio status private_2 to indicate there is an ordered extent with * unfinished IO. fs/btrfs/ctree.h const char *btrfs_super_csum_driver(u16 csum_type); · line 754
Quoted 10 lines
fs/btrfs/ctree.h +1
-4* -* Rename the Private2 accessors to Ordered, to improve readability. +* Rename the private_2 accessors to ordered, to improve readability. */ -#define PageOrdered (page) PagePrivate2(page) -#define SetPageOrdered (page) SetPagePrivate2(page) -#define ClearPageOrdered (page) ClearPagePrivate2(page)#define folio_test_ordered (folio) folio_test_private_2(folio)#define folio_set_ordered (folio) folio_set_private_2(folio)#define folio_clear_ordered (folio) folio_clear_private_2(folio)While this is right, there's a patch (now in linux-next)
https://lore.kernel.org/all/[email protected]/
that removes that (with some other updates).
Quoted 4 lines · Mark Harmstone
The Private2 #ifdefs in
ctree.hfor pages are no longer used, as of commitd71b53c3cb0a. Remove them, and update the comment to be about folios.Signed-off-by Mark Harmstone <[email protected]>
This is going to cause conflicts with the patch migrating private2 to owner2:
https://lore.kernel.org/linux-btrfs/[email protected]/
And that patch also removes the page opeartions.
Thanks,
Qu
Quoted 25 lines
--- fs/btrfs/ctree.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)fs/btrfs/ctree.h +2
-5@@ -744,14 +744,11 @@ const char *btrfs_super_csum_driver(u16 csum_type); size_t __attribute_const__ btrfs_get_num_csums(void);/* -* We use page status Private2 to indicate there is an ordered extent with +* We use folio status private_2 to indicate there is an ordered extent with * unfinished IO. * -* Rename the Private2 accessors to Ordered, to improve readability. +* Rename the private_2 accessors to ordered, to improve readability. */ -#define PageOrdered (page) PagePrivate2(page) -#define SetPageOrdered (page) SetPagePrivate2(page) -#define ClearPageOrdered (page) ClearPagePrivate2(page)#define folio_test_ordered (folio) folio_test_private_2(folio)#define folio_set_ordered (folio) folio_set_private_2(folio)#define folio_clear_ordered (folio) folio_clear_private_2(folio)