Skip to content

Commit 9d884a9

Browse files
Merge pull request #88 from lorelei-sakai/feature/use-mem-is-zero
Use mem_is_zero
2 parents 5706d0e + 5775997 commit 9d884a9

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

drivers/md/dm-vdo/data-vio.c

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/minmax.h>
1818
#include <linux/sched.h>
1919
#include <linux/spinlock.h>
20+
#include <linux/string.h>
2021
#include <linux/wait.h>
2122

2223
#include "logger.h"
@@ -509,18 +510,6 @@ static void launch_data_vio(struct data_vio *data_vio, logical_block_number_t lb
509510
vdo_enqueue_completion(completion, VDO_DEFAULT_Q_MAP_BIO_PRIORITY);
510511
}
511512

512-
static bool is_zero_block(char *block)
513-
{
514-
int i;
515-
516-
for (i = 0; i < VDO_BLOCK_SIZE; i += sizeof(u64)) {
517-
if (*((u64 *) &block[i]))
518-
return false;
519-
}
520-
521-
return true;
522-
}
523-
524513
static void copy_from_bio(struct bio *bio, char *data_ptr)
525514
{
526515
struct bio_vec biovec;
@@ -572,7 +561,7 @@ static void launch_bio(struct vdo *vdo, struct data_vio *data_vio, struct bio *b
572561
* we acknowledge the bio.
573562
*/
574563
copy_from_bio(bio, data_vio->vio.data);
575-
data_vio->is_zero = is_zero_block(data_vio->vio.data);
564+
data_vio->is_zero = mem_is_zero(data_vio->vio.data, VDO_BLOCK_SIZE);
576565
data_vio->write = true;
577566
}
578567

@@ -1459,7 +1448,7 @@ static void modify_for_partial_write(struct vdo_completion *completion)
14591448
copy_from_bio(bio, data + data_vio->offset);
14601449
}
14611450

1462-
data_vio->is_zero = is_zero_block(data);
1451+
data_vio->is_zero = mem_is_zero(data_vio->vio.data, VDO_BLOCK_SIZE);
14631452
data_vio->read = false;
14641453
launch_data_vio_logical_callback(data_vio,
14651454
continue_data_vio_with_block_map_slot);

0 commit comments

Comments
 (0)