2018-03-28 11:08:19

by Wei Yongjun

[permalink] [raw]
Subject: [PATCH -next] dm verity: make some functions static

Fixes the following sparse warnings:

drivers/md/dm-verity-target.c:375:6: warning:
symbol 'verity_for_io_block' was not declared. Should it be static?
drivers/md/dm-verity-target.c:403:14: warning:
symbol 'verity_calc_buffs_for_bv' was not declared. Should it be static?

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/md/dm-verity-target.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c
index da35f0e..e70d4d2 100644
--- a/drivers/md/dm-verity-target.c
+++ b/drivers/md/dm-verity-target.c
@@ -372,9 +372,9 @@ int verity_hash_for_block(struct dm_verity *v, struct dm_verity_io *io,
/*
* Calculates the digest for the given bio
*/
-void verity_for_io_block(struct dm_verity *v, struct dm_verity_io *io,
- struct bvec_iter *iter, struct scatterlist *sg,
- unsigned int *nents, unsigned int *total_len)
+static void verity_for_io_block(struct dm_verity *v, struct dm_verity_io *io,
+ struct bvec_iter *iter, struct scatterlist *sg,
+ unsigned int *nents, unsigned int *total_len)
{
unsigned int todo = 1 << v->data_dev_block_bits;
struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size);
@@ -400,8 +400,9 @@ void verity_for_io_block(struct dm_verity *v, struct dm_verity_io *io,
* Calculate how many buffers are required to accommodate
* bio_vec starting from iter.
*/
-unsigned int verity_calc_buffs_for_bv(struct dm_verity *v, struct dm_verity_io *io,
- struct bvec_iter *iter)
+static unsigned int verity_calc_buffs_for_bv(struct dm_verity *v,
+ struct dm_verity_io *io,
+ struct bvec_iter *iter)
{
unsigned int todo = 1 << v->data_dev_block_bits;
struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size);



2018-03-28 11:58:59

by Yael Chemla

[permalink] [raw]
Subject: RE: [PATCH -next] dm verity: make some functions static

Hi Wei,
i'll add this fix, got this also from the kbuild test robot.
Thank you,
Yael

> -----Original Message-----
> From: Wei Yongjun <[email protected]>
> Sent: Wednesday, 28 March 2018 14:12
> To: Alasdair Kergon <[email protected]>; Mike Snitzer <[email protected]>;
> yaeceh01 <[email protected]>
> Cc: Wei Yongjun <[email protected]>; [email protected]; linux-
> [email protected]; [email protected]
> Subject: [PATCH -next] dm verity: make some functions static
>
> Fixes the following sparse warnings:
>
> drivers/md/dm-verity-target.c:375:6: warning:
> symbol 'verity_for_io_block' was not declared. Should it be static?
> drivers/md/dm-verity-target.c:403:14: warning:
> symbol 'verity_calc_buffs_for_bv' was not declared. Should it be static?
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/md/dm-verity-target.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c
> index da35f0e..e70d4d2 100644
> --- a/drivers/md/dm-verity-target.c
> +++ b/drivers/md/dm-verity-target.c
> @@ -372,9 +372,9 @@ int verity_hash_for_block(struct dm_verity *v, struct
> dm_verity_io *io,
> /*
> * Calculates the digest for the given bio
> */
> -void verity_for_io_block(struct dm_verity *v, struct dm_verity_io *io,
> - struct bvec_iter *iter, struct scatterlist *sg,
> - unsigned int *nents, unsigned int *total_len)
> +static void verity_for_io_block(struct dm_verity *v, struct dm_verity_io *io,
> + struct bvec_iter *iter, struct scatterlist *sg,
> + unsigned int *nents, unsigned int *total_len)
> {
> unsigned int todo = 1 << v->data_dev_block_bits;
> struct bio *bio = dm_bio_from_per_bio_data(io, v->ti-
> >per_io_data_size); @@ -400,8 +400,9 @@ void verity_for_io_block(struct
> dm_verity *v, struct dm_verity_io *io,
> * Calculate how many buffers are required to accommodate
> * bio_vec starting from iter.
> */
> -unsigned int verity_calc_buffs_for_bv(struct dm_verity *v, struct
> dm_verity_io *io,
> - struct bvec_iter *iter)
> +static unsigned int verity_calc_buffs_for_bv(struct dm_verity *v,
> + struct dm_verity_io *io,
> + struct bvec_iter *iter)
> {
> unsigned int todo = 1 << v->data_dev_block_bits;
> struct bio *bio = dm_bio_from_per_bio_data(io, v->ti-
> >per_io_data_size);