| Message ID | 8cf9b5f14a52067bec9c4bb9f2d2c13821e0d7b6.1682990969.git.wqu@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs-progs: enable -Wmissing-prototypes for debug builds | expand |
On 02/05/2023 09:29, Qu Wenruo wrote: > During development I'm a little surpirsed we don't have > -Wmissing-prototypes enabled even for debug builds. > > Thus quite some obvious problems are not exposed. > > This patch would fix these all. > > Some are questionable, mostly from crypto: > > - Add blake2 hardware optimized definitions > - Add sha hardware optimized definitions > I have added such definitions unconditionally. They should still be > safe on platforms without such optimization. > > Others are pure safe fixes: > > - Unexport print_path_column() > - Unexport parse_reflink_range() > - Unexport btrfs_list_setup_print_column() > - Unexport device_get_partition_size_sysfs() > - Unexport read_path() > - Unexport ulist_release() > - Unexport max_zone_append_size() > - Unexport subvol_uuid_search_add() > - Delete blake2() > - Delete btrfs_check_allocatable_zones() > - Delete subvol_uuid_search_finit() > - Add needed headers > > Signed-off-by: Qu Wenruo <wqu@suse.com> LGTM. Reviewed-by: Anand Jain <anand.jain@oracle.com>
On Tue, May 02, 2023 at 09:29:30AM +0800, Qu Wenruo wrote: > During development I'm a little surpirsed we don't have > -Wmissing-prototypes enabled even for debug builds. The build supports W=levels like kernel and -Wmissing-prototypes is in level 1. In some cases we may want to add the warnings to be on by default for debugging builds though. > Thus quite some obvious problems are not exposed. > > This patch would fix these all. I'd rather see some of the changes split, and the warning enabled in a separate patch too. This would be the way in kernel and in progs we don't need to be that strict about patch separation but eg. the libbtrfs change is potentially touching the public API and should be explained separately, same for the function removals. > Some are questionable, mostly from crypto: And if you have questions like that then it's IMHO better to split it so it does not affect the rest of the patch that could be otherwise OK. > - Add blake2 hardware optimized definitions > - Add sha hardware optimized definitions > I have added such definitions unconditionally. They should still be > safe on platforms without such optimization. > > Others are pure safe fixes: > > - Unexport print_path_column() > - Unexport parse_reflink_range() > - Unexport btrfs_list_setup_print_column() > - Unexport device_get_partition_size_sysfs() > - Unexport read_path() > - Unexport ulist_release() > - Unexport max_zone_append_size() > - Unexport subvol_uuid_search_add() > - Delete blake2() > - Delete btrfs_check_allocatable_zones() > - Delete subvol_uuid_search_finit() > - Add needed headers > > Signed-off-by: Qu Wenruo <wqu@suse.com> > --- > Makefile | 2 +- > cmds/qgroup.c | 2 +- > cmds/reflink.c | 2 +- > cmds/subvolume-list.c | 2 +- > common/device-utils.c | 2 +- > common/utils.c | 2 +- > crypto/blake2.h | 4 +++ > crypto/blake2b-ref.c | 4 --- > crypto/sha.h | 2 ++ > crypto/sha256-x86.c | 2 ++ > kernel-shared/ulist.c | 2 +- > kernel-shared/zoned.c | 60 +------------------------------------------ > libbtrfs/send-utils.c | 31 ++-------------------- > tune/change-csum.c | 1 + > tune/change-uuid.c | 1 + > tune/convert-bgt.c | 1 + > tune/seeding.c | 1 + > tune/tune.h | 2 ++ > 18 files changed, 24 insertions(+), 99 deletions(-) > > diff --git a/Makefile b/Makefile > index b03367f26158..63bb8d4ef2a9 100644 > --- a/Makefile > +++ b/Makefile > @@ -66,7 +66,7 @@ include Makefile.extrawarn > EXTRA_CFLAGS := > EXTRA_LDFLAGS := > > -DEBUG_CFLAGS_DEFAULT = -O0 -U_FORTIFY_SOURCE -ggdb3 > +DEBUG_CFLAGS_DEFAULT = -O0 -U_FORTIFY_SOURCE -ggdb3 -Wmissing-prototypes > DEBUG_CFLAGS_INTERNAL = > DEBUG_CFLAGS := > > diff --git a/cmds/qgroup.c b/cmds/qgroup.c > index 49014d5702ec..70a749aa4062 100644 > --- a/cmds/qgroup.c > +++ b/cmds/qgroup.c > @@ -289,7 +289,7 @@ static void print_qgroup_column_add_blank(enum btrfs_qgroup_column_enum column, > printf(" "); > } > > -void print_path_column(struct btrfs_qgroup *qgroup) > +static void print_path_column(struct btrfs_qgroup *qgroup) Changes only adding static to functoius could be in one patch. > { > struct btrfs_qgroup_list *list = NULL; > > diff --git a/cmds/reflink.c b/cmds/reflink.c > index 24e562a744ff..14201349fc9f 100644 > --- a/cmds/reflink.c > +++ b/cmds/reflink.c > @@ -58,7 +58,7 @@ struct reflink_range { > bool same_file; > }; > > -void parse_reflink_range(const char *str, u64 *from, u64 *length, u64 *to) > +static void parse_reflink_range(const char *str, u64 *from, u64 *length, u64 *to) > { > char tmp[512]; > int i; > diff --git a/cmds/subvolume-list.c b/cmds/subvolume-list.c > index 750fc4e6354d..a667290c1585 100644 > --- a/cmds/subvolume-list.c > +++ b/cmds/subvolume-list.c > @@ -280,7 +280,7 @@ static struct { > static btrfs_list_filter_func all_filter_funcs[]; > static btrfs_list_comp_func all_comp_funcs[]; > > -void btrfs_list_setup_print_column(enum btrfs_list_column_enum column) > +static void btrfs_list_setup_print_column(enum btrfs_list_column_enum column) > { > int i; > > diff --git a/common/device-utils.c b/common/device-utils.c > index cb1a7a9d328a..70fbee49df1a 100644 > --- a/common/device-utils.c > +++ b/common/device-utils.c > @@ -332,7 +332,7 @@ u64 device_get_partition_size_fd(int fd) > return result; > } > > -u64 device_get_partition_size_sysfs(const char *dev) > +static u64 device_get_partition_size_sysfs(const char *dev) > { > int ret; > char path[PATH_MAX] = {}; > diff --git a/common/utils.c b/common/utils.c > index 2c359dcf220f..3c67e1eb453c 100644 > --- a/common/utils.c > +++ b/common/utils.c > @@ -498,7 +498,7 @@ static bool valid_escape(const char *str) > * - line is advanced to the final separator or nul character > * - returned path is a valid string terminated by zero or whitespace separator > */ > -char *read_path(char **line) > +static char *read_path(char **line) > { > char *ret = *line; > char *out = *line; > diff --git a/crypto/blake2.h b/crypto/blake2.h > index cd89adb65a9b..784b82c5ea63 100644 > --- a/crypto/blake2.h > +++ b/crypto/blake2.h > @@ -92,6 +92,10 @@ extern "C" { > > void blake2_init_accel(void); > > +void blake2b_compress_sse2( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] ); > +void blake2b_compress_sse41( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] ); > +void blake2b_compress_avx2( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] ); Unused prototypes do no harm, so it's probably ok to have it here. > + > #if defined(__cplusplus) > } > #endif > diff --git a/crypto/blake2b-ref.c b/crypto/blake2b-ref.c > index eac4cf0c48da..f28dce3ae2a8 100644 > --- a/crypto/blake2b-ref.c > +++ b/crypto/blake2b-ref.c > @@ -326,10 +326,6 @@ int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void > return 0; > } > > -int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen ) { > - return blake2b(out, outlen, in, inlen, key, keylen); > -} Removing code should be also split to another patch, though in this case it's quite trivial. > - > #if defined(SUPERCOP) > int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen ) > { > diff --git a/crypto/sha.h b/crypto/sha.h > index e65418ccd0d3..4cca17116966 100644 > --- a/crypto/sha.h > +++ b/crypto/sha.h > @@ -211,4 +211,6 @@ extern int hmacResult(HMACContext *context, > > void sha256_init_accel(void); > > +void sha256_process_x86(uint32_t state[8], const uint8_t data[], uint32_t length); > + > #endif /* _SHA_H_ */ > diff --git a/crypto/sha256-x86.c b/crypto/sha256-x86.c > index 602c53cf4f60..6acf67e07eea 100644 > --- a/crypto/sha256-x86.c > +++ b/crypto/sha256-x86.c > @@ -7,6 +7,8 @@ > > #ifdef __SHA__ > > +#include "sha.h" This does not seem necessary, include whole file just for one prototype. > + > /* Include the GCC super header */ > #if defined(__GNUC__) > # include <stdint.h> > diff --git a/kernel-shared/ulist.c b/kernel-shared/ulist.c > index e193b02d5f33..6f231a3d9eab 100644 > --- a/kernel-shared/ulist.c > +++ b/kernel-shared/ulist.c > @@ -72,7 +72,7 @@ void ulist_init(struct ulist *ulist) > * This is useful in cases where the base 'struct ulist' has been statically > * allocated. > */ > -void ulist_release(struct ulist *ulist) > +static void ulist_release(struct ulist *ulist) > { > struct ulist_node *node; > struct ulist_node *next; > diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c > index 7d2e68d08bcc..d187c5763406 100644 > --- a/kernel-shared/zoned.c > +++ b/kernel-shared/zoned.c > @@ -92,7 +92,7 @@ u64 zone_size(const char *file) > return strtoull((const char *)chunk, NULL, 10) << SECTOR_SHIFT; > } > > -u64 max_zone_append_size(const char *file) > +static u64 max_zone_append_size(const char *file) > { > char chunk[32]; > int ret; > @@ -596,64 +596,6 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw) > return ret_sz; > } > > -/* > - * Check if spcecifeid region is suitable for allocation > - * > - * @device: the device to allocate a region > - * @pos: the position of the region > - * @num_bytes: the size of the region > - * > - * In non-ZONED device, anywhere is suitable for allocation. In ZONED > - * device, check if: > - * 1) the region is not on non-empty sequential zones, > - * 2) all zones in the region have the same zone type, > - * 3) it does not contain super block location > - */ > -bool btrfs_check_allocatable_zones(struct btrfs_device *device, u64 pos, > - u64 num_bytes) This should be in a separate patch explaining why it's ok to remove the function. > -{ > - struct btrfs_zoned_device_info *zinfo = device->zone_info; > - u64 nzones, begin, end; > - u64 sb_pos; > - bool is_sequential; > - int shift; > - int i; > - > - if (!zinfo || zinfo->model == ZONED_NONE) > - return true; > - > - nzones = num_bytes / zinfo->zone_size; > - begin = pos / zinfo->zone_size; > - end = begin + nzones; > - > - ASSERT(IS_ALIGNED(pos, zinfo->zone_size)); > - ASSERT(IS_ALIGNED(num_bytes, zinfo->zone_size)); > - > - if (end > zinfo->nr_zones) > - return false; > - > - shift = ilog2(zinfo->zone_size); > - for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) { > - sb_pos = sb_zone_number(shift, i); > - if (!(end < sb_pos || sb_pos + 1 < begin)) > - return false; > - } > - > - is_sequential = btrfs_dev_is_sequential(device, pos); > - > - while (num_bytes) { > - if (is_sequential && !btrfs_dev_is_empty_zone(device, pos)) > - return false; > - if (is_sequential != btrfs_dev_is_sequential(device, pos)) > - return false; > - > - pos += zinfo->zone_size; > - num_bytes -= zinfo->zone_size; > - } > - > - return true; > -} > - > /** > * btrfs_find_allocatable_zones - find allocatable zones within a given region > * > diff --git a/libbtrfs/send-utils.c b/libbtrfs/send-utils.c > index 831ec0dc1222..8eb0a4518277 100644 > --- a/libbtrfs/send-utils.c > +++ b/libbtrfs/send-utils.c > @@ -377,7 +377,7 @@ static int count_bytes(void *buf, int len, char b) > return cnt; > } > > -void subvol_uuid_search_add(struct subvol_uuid_search *s, > +static void subvol_uuid_search_add(struct subvol_uuid_search *s, > struct subvol_info *si) Libbtrfs changes need explanation why it's ok and that it does not break the userspace API. > { > int cnt; > @@ -462,7 +462,7 @@ static struct subvol_info *subvol_uuid_search_old(struct subvol_uuid_search *s, > return tree_search(root, root_id, uuid, transid, path, type); > } > #else > -void subvol_uuid_search_add(struct subvol_uuid_search *s, > +static void subvol_uuid_search_add(struct subvol_uuid_search *s, > struct subvol_info *si) > { > if (si) { > @@ -821,29 +821,6 @@ skip: > out: > return ret; > } > - > -void subvol_uuid_search_finit(struct subvol_uuid_search *s) The function used to be exported in libbtrfs but got disabled in 56e99634749568 ("btrfs-progs: libbtrfs: hide unused symbols, same version") and removed completely in 751be36f8650aa ("btrfs-progs: delete commented exports from libbtrfs.sym"). This also needs to be explained separately with links to the other commits for continuity. > -{ > - struct rb_root *root = &s->root_id_subvols; > - struct rb_node *node; > - > - if (!s->uuid_tree_existed) > - return; > - > - while ((node = rb_first(root))) { > - struct subvol_info *entry = > - rb_entry(node, struct subvol_info, rb_root_id_node); > - > - free(entry->path); > - rb_erase(node, root); > - free(entry); > - } > - > - s->root_id_subvols = RB_ROOT; > - s->local_subvols = RB_ROOT; > - s->received_subvols = RB_ROOT; > - s->path_subvols = RB_ROOT; > -} > #else > int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s) > { > @@ -851,8 +828,4 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s) > > return 0; > } > - > -void subvol_uuid_search_finit(struct subvol_uuid_search *s) > -{ > -} > #endif > diff --git a/tune/change-csum.c b/tune/change-csum.c > index a11316860e3c..4531f2190f06 100644 > --- a/tune/change-csum.c > +++ b/tune/change-csum.c > @@ -24,6 +24,7 @@ > #include "kernel-shared/transaction.h" > #include "common/messages.h" > #include "common/internal.h" > +#include "tune/tune.h" > > static int change_tree_csum(struct btrfs_trans_handle *trans, struct btrfs_root *root, > int csum_type) > diff --git a/tune/change-uuid.c b/tune/change-uuid.c > index f148b9e54915..99ce0b15b2b9 100644 > --- a/tune/change-uuid.c > +++ b/tune/change-uuid.c > @@ -25,6 +25,7 @@ > #include "kernel-shared/volumes.h" > #include "common/defs.h" > #include "common/messages.h" > +#include "tune/tune.h" > #include "ioctl.h" > > static int change_fsid_prepare(struct btrfs_fs_info *fs_info, uuid_t new_fsid) > diff --git a/tune/convert-bgt.c b/tune/convert-bgt.c > index 27953cb26ada..c6bd4361f8ac 100644 > --- a/tune/convert-bgt.c > +++ b/tune/convert-bgt.c > @@ -22,6 +22,7 @@ > #include "kernel-shared/transaction.h" > #include "common/messages.h" > #include "common/extent-cache.h" > +#include "tune/tune.h" > > /* After this many block groups we need to commit transaction. */ > #define BLOCK_GROUP_BATCH 64 > diff --git a/tune/seeding.c b/tune/seeding.c > index 80b075e53baa..99ad455e9468 100644 > --- a/tune/seeding.c > +++ b/tune/seeding.c > @@ -18,6 +18,7 @@ > #include "kernel-shared/ctree.h" > #include "kernel-shared/transaction.h" > #include "common/messages.h" > +#include "tune/tune.h" > > int update_seeding_flag(struct btrfs_root *root, const char *device, int set_flag, int force) > { > diff --git a/tune/tune.h b/tune/tune.h > index 6beae9fc9ef7..753dc95eb138 100644 > --- a/tune/tune.h > +++ b/tune/tune.h > @@ -17,6 +17,8 @@ > #ifndef __BTRFS_TUNE_H__ > #define __BTRFS_TUNE_H__ > > +#include <uuid/uuid.h> > + > struct btrfs_root; > struct btrfs_fs_info; > > -- > 2.39.2
On 2023/5/2 19:41, David Sterba wrote: > On Tue, May 02, 2023 at 09:29:30AM +0800, Qu Wenruo wrote: >> During development I'm a little surpirsed we don't have >> -Wmissing-prototypes enabled even for debug builds. > > The build supports W=levels like kernel and -Wmissing-prototypes is in > level 1. In some cases we may want to add the warnings to be on by > default for debugging builds though. I just did a quick search for the word "missing" of progs Makefile, unforunately no hit, thus I doubt if it's even in debug level 1. And the missing prototypes warning is by default enabled for kernel. [...] >> >> +#include "sha.h" > > This does not seem necessary, include whole file just for one prototype. This is necessary as we would define a global function, without including the header we got the missing prototype warning. All the other comments make sense and I would update the patchset. The only other concern is, would this extra warning causing more hassles for Josef to sync the kernel and progs code? Thanks, Qu
On Tue, May 02, 2023 at 08:00:57PM +0800, Qu Wenruo wrote: > > > On 2023/5/2 19:41, David Sterba wrote: > > On Tue, May 02, 2023 at 09:29:30AM +0800, Qu Wenruo wrote: > >> During development I'm a little surpirsed we don't have > >> -Wmissing-prototypes enabled even for debug builds. > > > > The build supports W=levels like kernel and -Wmissing-prototypes is in > > level 1. In some cases we may want to add the warnings to be on by > > default for debugging builds though. > > I just did a quick search for the word "missing" of progs Makefile, > unforunately no hit, thus I doubt if it's even in debug level 1. > > And the missing prototypes warning is by default enabled for kernel. $ grep missing Makefile.extrawarn warning-1 += -Wmissing-declarations warning-1 += -Wmissing-format-attribute warning-1 += $(call cc-option, -Wmissing-prototypes) warning-1 += $(call cc-option, -Wmissing-include-dirs) warning-1 += $(call cc-disable-warning, missing-field-initializers) warning-2 += $(call cc-option, -Wmissing-field-initializers) > [...] > >> > >> +#include "sha.h" > > > > This does not seem necessary, include whole file just for one prototype. > > This is necessary as we would define a global function, without > including the header we got the missing prototype warning. > > All the other comments make sense and I would update the patchset. > > > The only other concern is, would this extra warning causing more hassles > for Josef to sync the kernel and progs code? I don't know yet but it is possible that it would. In that case the separate patch would make it easier to enable once all warnings are fixed, I can keep it at the top of the branch.
On Tue, May 02, 2023 at 03:30:45PM +0200, David Sterba wrote: > On Tue, May 02, 2023 at 08:00:57PM +0800, Qu Wenruo wrote: > > > > > > On 2023/5/2 19:41, David Sterba wrote: > > > On Tue, May 02, 2023 at 09:29:30AM +0800, Qu Wenruo wrote: > > >> During development I'm a little surpirsed we don't have > > >> -Wmissing-prototypes enabled even for debug builds. > > > > > > The build supports W=levels like kernel and -Wmissing-prototypes is in > > > level 1. In some cases we may want to add the warnings to be on by > > > default for debugging builds though. > > > > I just did a quick search for the word "missing" of progs Makefile, > > unforunately no hit, thus I doubt if it's even in debug level 1. > > > > And the missing prototypes warning is by default enabled for kernel. > > $ grep missing Makefile.extrawarn > warning-1 += -Wmissing-declarations > warning-1 += -Wmissing-format-attribute > warning-1 += $(call cc-option, -Wmissing-prototypes) > warning-1 += $(call cc-option, -Wmissing-include-dirs) > warning-1 += $(call cc-disable-warning, missing-field-initializers) > warning-2 += $(call cc-option, -Wmissing-field-initializers) > > > [...] > > >> > > >> +#include "sha.h" > > > > > > This does not seem necessary, include whole file just for one prototype. > > > > This is necessary as we would define a global function, without > > including the header we got the missing prototype warning. > > > > All the other comments make sense and I would update the patchset. > > > > > > The only other concern is, would this extra warning causing more hassles > > for Josef to sync the kernel and progs code? > > I don't know yet but it is possible that it would. In that case the separate > patch would make it easier to enable once all warnings are fixed, I can keep it > at the top of the branch. Do you want me to run these warnings through my series and re-send? That may be faster than trying to merge everything together. Thanks, Josef
On Tue, May 02, 2023 at 10:25:33AM -0400, Josef Bacik wrote: > On Tue, May 02, 2023 at 03:30:45PM +0200, David Sterba wrote: > > On Tue, May 02, 2023 at 08:00:57PM +0800, Qu Wenruo wrote: > > > > > > > > > On 2023/5/2 19:41, David Sterba wrote: > > > > On Tue, May 02, 2023 at 09:29:30AM +0800, Qu Wenruo wrote: > > > >> During development I'm a little surpirsed we don't have > > > >> -Wmissing-prototypes enabled even for debug builds. > > > > > > > > The build supports W=levels like kernel and -Wmissing-prototypes is in > > > > level 1. In some cases we may want to add the warnings to be on by > > > > default for debugging builds though. > > > > > > I just did a quick search for the word "missing" of progs Makefile, > > > unforunately no hit, thus I doubt if it's even in debug level 1. > > > > > > And the missing prototypes warning is by default enabled for kernel. > > > > $ grep missing Makefile.extrawarn > > warning-1 += -Wmissing-declarations > > warning-1 += -Wmissing-format-attribute > > warning-1 += $(call cc-option, -Wmissing-prototypes) > > warning-1 += $(call cc-option, -Wmissing-include-dirs) > > warning-1 += $(call cc-disable-warning, missing-field-initializers) > > warning-2 += $(call cc-option, -Wmissing-field-initializers) > > > > > [...] > > > >> > > > >> +#include "sha.h" > > > > > > > > This does not seem necessary, include whole file just for one prototype. > > > > > > This is necessary as we would define a global function, without > > > including the header we got the missing prototype warning. > > > > > > All the other comments make sense and I would update the patchset. > > > > > > > > > The only other concern is, would this extra warning causing more hassles > > > for Josef to sync the kernel and progs code? > > > > I don't know yet but it is possible that it would. In that case the separate > > patch would make it easier to enable once all warnings are fixed, I can keep it > > at the top of the branch. > > Do you want me to run these warnings through my series and re-send? That may be > faster than trying to merge everything together. Thanks, I'd rather get the series merged first, fixing all the warnings can be done right before release.
diff --git a/Makefile b/Makefile index b03367f26158..63bb8d4ef2a9 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ include Makefile.extrawarn EXTRA_CFLAGS := EXTRA_LDFLAGS := -DEBUG_CFLAGS_DEFAULT = -O0 -U_FORTIFY_SOURCE -ggdb3 +DEBUG_CFLAGS_DEFAULT = -O0 -U_FORTIFY_SOURCE -ggdb3 -Wmissing-prototypes DEBUG_CFLAGS_INTERNAL = DEBUG_CFLAGS := diff --git a/cmds/qgroup.c b/cmds/qgroup.c index 49014d5702ec..70a749aa4062 100644 --- a/cmds/qgroup.c +++ b/cmds/qgroup.c @@ -289,7 +289,7 @@ static void print_qgroup_column_add_blank(enum btrfs_qgroup_column_enum column, printf(" "); } -void print_path_column(struct btrfs_qgroup *qgroup) +static void print_path_column(struct btrfs_qgroup *qgroup) { struct btrfs_qgroup_list *list = NULL; diff --git a/cmds/reflink.c b/cmds/reflink.c index 24e562a744ff..14201349fc9f 100644 --- a/cmds/reflink.c +++ b/cmds/reflink.c @@ -58,7 +58,7 @@ struct reflink_range { bool same_file; }; -void parse_reflink_range(const char *str, u64 *from, u64 *length, u64 *to) +static void parse_reflink_range(const char *str, u64 *from, u64 *length, u64 *to) { char tmp[512]; int i; diff --git a/cmds/subvolume-list.c b/cmds/subvolume-list.c index 750fc4e6354d..a667290c1585 100644 --- a/cmds/subvolume-list.c +++ b/cmds/subvolume-list.c @@ -280,7 +280,7 @@ static struct { static btrfs_list_filter_func all_filter_funcs[]; static btrfs_list_comp_func all_comp_funcs[]; -void btrfs_list_setup_print_column(enum btrfs_list_column_enum column) +static void btrfs_list_setup_print_column(enum btrfs_list_column_enum column) { int i; diff --git a/common/device-utils.c b/common/device-utils.c index cb1a7a9d328a..70fbee49df1a 100644 --- a/common/device-utils.c +++ b/common/device-utils.c @@ -332,7 +332,7 @@ u64 device_get_partition_size_fd(int fd) return result; } -u64 device_get_partition_size_sysfs(const char *dev) +static u64 device_get_partition_size_sysfs(const char *dev) { int ret; char path[PATH_MAX] = {}; diff --git a/common/utils.c b/common/utils.c index 2c359dcf220f..3c67e1eb453c 100644 --- a/common/utils.c +++ b/common/utils.c @@ -498,7 +498,7 @@ static bool valid_escape(const char *str) * - line is advanced to the final separator or nul character * - returned path is a valid string terminated by zero or whitespace separator */ -char *read_path(char **line) +static char *read_path(char **line) { char *ret = *line; char *out = *line; diff --git a/crypto/blake2.h b/crypto/blake2.h index cd89adb65a9b..784b82c5ea63 100644 --- a/crypto/blake2.h +++ b/crypto/blake2.h @@ -92,6 +92,10 @@ extern "C" { void blake2_init_accel(void); +void blake2b_compress_sse2( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] ); +void blake2b_compress_sse41( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] ); +void blake2b_compress_avx2( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] ); + #if defined(__cplusplus) } #endif diff --git a/crypto/blake2b-ref.c b/crypto/blake2b-ref.c index eac4cf0c48da..f28dce3ae2a8 100644 --- a/crypto/blake2b-ref.c +++ b/crypto/blake2b-ref.c @@ -326,10 +326,6 @@ int blake2b( void *out, size_t outlen, const void *in, size_t inlen, const void return 0; } -int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen ) { - return blake2b(out, outlen, in, inlen, key, keylen); -} - #if defined(SUPERCOP) int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen ) { diff --git a/crypto/sha.h b/crypto/sha.h index e65418ccd0d3..4cca17116966 100644 --- a/crypto/sha.h +++ b/crypto/sha.h @@ -211,4 +211,6 @@ extern int hmacResult(HMACContext *context, void sha256_init_accel(void); +void sha256_process_x86(uint32_t state[8], const uint8_t data[], uint32_t length); + #endif /* _SHA_H_ */ diff --git a/crypto/sha256-x86.c b/crypto/sha256-x86.c index 602c53cf4f60..6acf67e07eea 100644 --- a/crypto/sha256-x86.c +++ b/crypto/sha256-x86.c @@ -7,6 +7,8 @@ #ifdef __SHA__ +#include "sha.h" + /* Include the GCC super header */ #if defined(__GNUC__) # include <stdint.h> diff --git a/kernel-shared/ulist.c b/kernel-shared/ulist.c index e193b02d5f33..6f231a3d9eab 100644 --- a/kernel-shared/ulist.c +++ b/kernel-shared/ulist.c @@ -72,7 +72,7 @@ void ulist_init(struct ulist *ulist) * This is useful in cases where the base 'struct ulist' has been statically * allocated. */ -void ulist_release(struct ulist *ulist) +static void ulist_release(struct ulist *ulist) { struct ulist_node *node; struct ulist_node *next; diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c index 7d2e68d08bcc..d187c5763406 100644 --- a/kernel-shared/zoned.c +++ b/kernel-shared/zoned.c @@ -92,7 +92,7 @@ u64 zone_size(const char *file) return strtoull((const char *)chunk, NULL, 10) << SECTOR_SHIFT; } -u64 max_zone_append_size(const char *file) +static u64 max_zone_append_size(const char *file) { char chunk[32]; int ret; @@ -596,64 +596,6 @@ size_t btrfs_sb_io(int fd, void *buf, off_t offset, int rw) return ret_sz; } -/* - * Check if spcecifeid region is suitable for allocation - * - * @device: the device to allocate a region - * @pos: the position of the region - * @num_bytes: the size of the region - * - * In non-ZONED device, anywhere is suitable for allocation. In ZONED - * device, check if: - * 1) the region is not on non-empty sequential zones, - * 2) all zones in the region have the same zone type, - * 3) it does not contain super block location - */ -bool btrfs_check_allocatable_zones(struct btrfs_device *device, u64 pos, - u64 num_bytes) -{ - struct btrfs_zoned_device_info *zinfo = device->zone_info; - u64 nzones, begin, end; - u64 sb_pos; - bool is_sequential; - int shift; - int i; - - if (!zinfo || zinfo->model == ZONED_NONE) - return true; - - nzones = num_bytes / zinfo->zone_size; - begin = pos / zinfo->zone_size; - end = begin + nzones; - - ASSERT(IS_ALIGNED(pos, zinfo->zone_size)); - ASSERT(IS_ALIGNED(num_bytes, zinfo->zone_size)); - - if (end > zinfo->nr_zones) - return false; - - shift = ilog2(zinfo->zone_size); - for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) { - sb_pos = sb_zone_number(shift, i); - if (!(end < sb_pos || sb_pos + 1 < begin)) - return false; - } - - is_sequential = btrfs_dev_is_sequential(device, pos); - - while (num_bytes) { - if (is_sequential && !btrfs_dev_is_empty_zone(device, pos)) - return false; - if (is_sequential != btrfs_dev_is_sequential(device, pos)) - return false; - - pos += zinfo->zone_size; - num_bytes -= zinfo->zone_size; - } - - return true; -} - /** * btrfs_find_allocatable_zones - find allocatable zones within a given region * diff --git a/libbtrfs/send-utils.c b/libbtrfs/send-utils.c index 831ec0dc1222..8eb0a4518277 100644 --- a/libbtrfs/send-utils.c +++ b/libbtrfs/send-utils.c @@ -377,7 +377,7 @@ static int count_bytes(void *buf, int len, char b) return cnt; } -void subvol_uuid_search_add(struct subvol_uuid_search *s, +static void subvol_uuid_search_add(struct subvol_uuid_search *s, struct subvol_info *si) { int cnt; @@ -462,7 +462,7 @@ static struct subvol_info *subvol_uuid_search_old(struct subvol_uuid_search *s, return tree_search(root, root_id, uuid, transid, path, type); } #else -void subvol_uuid_search_add(struct subvol_uuid_search *s, +static void subvol_uuid_search_add(struct subvol_uuid_search *s, struct subvol_info *si) { if (si) { @@ -821,29 +821,6 @@ skip: out: return ret; } - -void subvol_uuid_search_finit(struct subvol_uuid_search *s) -{ - struct rb_root *root = &s->root_id_subvols; - struct rb_node *node; - - if (!s->uuid_tree_existed) - return; - - while ((node = rb_first(root))) { - struct subvol_info *entry = - rb_entry(node, struct subvol_info, rb_root_id_node); - - free(entry->path); - rb_erase(node, root); - free(entry); - } - - s->root_id_subvols = RB_ROOT; - s->local_subvols = RB_ROOT; - s->received_subvols = RB_ROOT; - s->path_subvols = RB_ROOT; -} #else int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s) { @@ -851,8 +828,4 @@ int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s) return 0; } - -void subvol_uuid_search_finit(struct subvol_uuid_search *s) -{ -} #endif diff --git a/tune/change-csum.c b/tune/change-csum.c index a11316860e3c..4531f2190f06 100644 --- a/tune/change-csum.c +++ b/tune/change-csum.c @@ -24,6 +24,7 @@ #include "kernel-shared/transaction.h" #include "common/messages.h" #include "common/internal.h" +#include "tune/tune.h" static int change_tree_csum(struct btrfs_trans_handle *trans, struct btrfs_root *root, int csum_type) diff --git a/tune/change-uuid.c b/tune/change-uuid.c index f148b9e54915..99ce0b15b2b9 100644 --- a/tune/change-uuid.c +++ b/tune/change-uuid.c @@ -25,6 +25,7 @@ #include "kernel-shared/volumes.h" #include "common/defs.h" #include "common/messages.h" +#include "tune/tune.h" #include "ioctl.h" static int change_fsid_prepare(struct btrfs_fs_info *fs_info, uuid_t new_fsid) diff --git a/tune/convert-bgt.c b/tune/convert-bgt.c index 27953cb26ada..c6bd4361f8ac 100644 --- a/tune/convert-bgt.c +++ b/tune/convert-bgt.c @@ -22,6 +22,7 @@ #include "kernel-shared/transaction.h" #include "common/messages.h" #include "common/extent-cache.h" +#include "tune/tune.h" /* After this many block groups we need to commit transaction. */ #define BLOCK_GROUP_BATCH 64 diff --git a/tune/seeding.c b/tune/seeding.c index 80b075e53baa..99ad455e9468 100644 --- a/tune/seeding.c +++ b/tune/seeding.c @@ -18,6 +18,7 @@ #include "kernel-shared/ctree.h" #include "kernel-shared/transaction.h" #include "common/messages.h" +#include "tune/tune.h" int update_seeding_flag(struct btrfs_root *root, const char *device, int set_flag, int force) { diff --git a/tune/tune.h b/tune/tune.h index 6beae9fc9ef7..753dc95eb138 100644 --- a/tune/tune.h +++ b/tune/tune.h @@ -17,6 +17,8 @@ #ifndef __BTRFS_TUNE_H__ #define __BTRFS_TUNE_H__ +#include <uuid/uuid.h> + struct btrfs_root; struct btrfs_fs_info;
During development I'm a little surpirsed we don't have -Wmissing-prototypes enabled even for debug builds. Thus quite some obvious problems are not exposed. This patch would fix these all. Some are questionable, mostly from crypto: - Add blake2 hardware optimized definitions - Add sha hardware optimized definitions I have added such definitions unconditionally. They should still be safe on platforms without such optimization. Others are pure safe fixes: - Unexport print_path_column() - Unexport parse_reflink_range() - Unexport btrfs_list_setup_print_column() - Unexport device_get_partition_size_sysfs() - Unexport read_path() - Unexport ulist_release() - Unexport max_zone_append_size() - Unexport subvol_uuid_search_add() - Delete blake2() - Delete btrfs_check_allocatable_zones() - Delete subvol_uuid_search_finit() - Add needed headers Signed-off-by: Qu Wenruo <wqu@suse.com> --- Makefile | 2 +- cmds/qgroup.c | 2 +- cmds/reflink.c | 2 +- cmds/subvolume-list.c | 2 +- common/device-utils.c | 2 +- common/utils.c | 2 +- crypto/blake2.h | 4 +++ crypto/blake2b-ref.c | 4 --- crypto/sha.h | 2 ++ crypto/sha256-x86.c | 2 ++ kernel-shared/ulist.c | 2 +- kernel-shared/zoned.c | 60 +------------------------------------------ libbtrfs/send-utils.c | 31 ++-------------------- tune/change-csum.c | 1 + tune/change-uuid.c | 1 + tune/convert-bgt.c | 1 + tune/seeding.c | 1 + tune/tune.h | 2 ++ 18 files changed, 24 insertions(+), 99 deletions(-)