From 5cf1cd8e9bbe84d34f25c304917da2505c4b90d2 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Thu, 31 Mar 2011 11:35:16 -0400 Subject: [PATCH 3/5] define 'bi_unsupported_name' to avoid duplicated "unsupported" string --- block/blk-integrity.c | 2 +- include/linux/blkdev.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 54bcba6..c2408ff 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -407,7 +407,7 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template) bi->get_tag_fn = template->get_tag_fn; bi->tag_size = template->tag_size; } else - bi->name = "unsupported"; + bi->name = bi_unsupported_name; return 0; } diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 90b1436..8dd2beb 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1248,9 +1248,11 @@ queue_max_integrity_segments(struct request_queue *q) return q->limits.max_integrity_segments; } +static const char *bi_unsupported_name = "unsupported"; + static inline bool blk_integrity_is_initialized(struct blk_integrity *bi) { - return (bi && bi->name && strcmp(bi->name, "unsupported") != 0); + return (bi && bi->name && strcmp(bi->name, bi_unsupported_name) != 0); } #else /* CONFIG_BLK_DEV_INTEGRITY */ -- 1.7.3.4