github/open-cas-linux
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #167 from arutk/fix_block_dev_get_elevator_name_prototype

Browse Source 
Make __block_dev_get_elevator_name return const string
This commit is contained in:
Robert Baldyga
2019-11-05 12:35:21 +01:00
committed by GitHub
parent 30901ef5c7 ff207f9b2e
commit baa621e882
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cas_cache/volume/vol_block_dev_bottom.c
View File

@@ -92,7 +92,7 @@ uint64_t block_dev_get_byte_length(ocf_volume_t vol)
}
#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 3, 0)
static char *__block_dev_get_elevator_name(struct request_queue *q)
static const char *__block_dev_get_elevator_name(struct request_queue *q)
{
if (q->elevator->elevator_type == NULL)
return NULL;
@@ -106,7 +106,7 @@ static char *__block_dev_get_elevator_name(struct request_queue *q)
return q->elevator->elevator_type->elevator_name;
}
#else
static char *__block_dev_get_elevator_name(struct request_queue *q)
static const char *__block_dev_get_elevator_name(struct request_queue *q)
{
if (q->elevator->type == NULL)
return NULL;