From c7ac8c55f42eab3864ba7b735ef47ad593e9aa6e Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Mon, 17 May 2021 16:57:32 +0200 Subject: [PATCH] Remove unused configs Signed-off-by: Robert Baldyga --- configure.d/1_blk_bidi_req.conf | 33 ------------- configure.d/1_default_make_request.conf | 54 --------------------- configure.d/1_req_flush.conf | 40 ---------------- configure.d/1_req_fs.conf | 47 ------------------ configure.d/1_write_fua.conf | 55 --------------------- configure.d/2_flush_fua.conf | 55 --------------------- configure.d/2_write_flush.conf | 63 ------------------------- 7 files changed, 347 deletions(-) delete mode 100644 configure.d/1_blk_bidi_req.conf delete mode 100644 configure.d/1_default_make_request.conf delete mode 100644 configure.d/1_req_flush.conf delete mode 100644 configure.d/1_req_fs.conf delete mode 100644 configure.d/1_write_fua.conf delete mode 100644 configure.d/2_flush_fua.conf delete mode 100644 configure.d/2_write_flush.conf diff --git a/configure.d/1_blk_bidi_req.conf b/configure.d/1_blk_bidi_req.conf deleted file mode 100644 index 967aa23..0000000 --- a/configure.d/1_blk_bidi_req.conf +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# -# Copyright(c) 2012-2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause-Clear -# - -. $(dirname $3)/conf_framework - -check() { - cur_name=$(basename $2) - config_file_path=$1 - if compile_module $cur_name "blk_bidi_rq(rq);" "linux/blkdev.h" - then - echo $cur_name "1" >> $config_file_path - else - echo $cur_name "2" >> $config_file_path - fi -} - -apply() { - case "$1" in - "1") - add_define "CAS_BLK_BIDI_RQ(rq) \\ - blk_bidi_rq(rq)" ;; - "2") - add_define "CAS_BLK_BIDI_RQ(rq) \\ - false" ;; - *) - exit 1 - esac -} - -conf_run $@ diff --git a/configure.d/1_default_make_request.conf b/configure.d/1_default_make_request.conf deleted file mode 100644 index 1b9301d..0000000 --- a/configure.d/1_default_make_request.conf +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Copyright(c) 2012-2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause-Clear -# - -. $(dirname $3)/conf_framework - -check() { - cur_name=$(basename $2) - config_file_path=$1 - if compile_module $cur_name "blk_mq_make_request(NULL, NULL);" "linux/blk-mq.h" - then - echo $cur_name "1" >> $config_file_path - else - echo $cur_name "2" >> $config_file_path - fi -} - -apply() { - case "$1" in - "1") - add_function " - static inline void *cas_get_default_mk_request_fn(struct request_queue *q) - { - if (q->make_request_fn) - return q->make_request_fn; - return blk_mq_make_request; - }" - add_function " - static inline void cas_call_default_mk_request_fn(make_request_fn *fn, - struct request_queue *q, struct bio *bio) - { - percpu_ref_get(&q->q_usage_counter); - fn(q, bio); - }" ;; - "2") - add_function " - static inline void *cas_get_default_mk_request_fn(struct request_queue *q) - { - return q->make_request_fn; - }" - add_function " - static inline void cas_call_default_mk_request_fn(make_request_fn *fn, - struct request_queue *q, struct bio *bio) - { - fn(q, bio); - }" ;; - *) - exit 1 - esac -} - -conf_run $@ diff --git a/configure.d/1_req_flush.conf b/configure.d/1_req_flush.conf deleted file mode 100644 index 0648fc9..0000000 --- a/configure.d/1_req_flush.conf +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# -# Copyright(c) 2012-2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause-Clear -# - -. $(dirname $3)/conf_framework - -check() { - cur_name=$(basename $2) - config_file_path=$1 - if compile_module $cur_name "REQ_PREFLUSH" "linux/blk_types.h" - then - echo $cur_name "1" >> $config_file_path - elif compile_module $cur_name "REQ_FLUSH" "linux/blk_types.h" - then - echo $cur_name "2" >> $config_file_path - else - echo $cur_name "X" >> $config_file_path - fi -} - -apply() { - case "$1" in - "1") - add_define "CAS_REQ_FLUSH \\ - REQ_PREFLUSH" - add_define "CAS_FLUSH_SUPPORTED \\ - 1" ;; - "2") - add_define "CAS_REQ_FLUSH \\ - REQ_FLUSH" - add_define "CAS_FLUSH_SUPPORTED \\ - 1" ;; - *) - exit 1 - esac -} - -conf_run $@ diff --git a/configure.d/1_req_fs.conf b/configure.d/1_req_fs.conf deleted file mode 100644 index 6a972d7..0000000 --- a/configure.d/1_req_fs.conf +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# -# Copyright(c) 2012-2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause-Clear -# - -. $(dirname $3)/conf_framework - -check() { - cur_name=$(basename $2) - config_file_path=$1 - if compile_module $cur_name "REQ_TYPE_FS" "linux/blkdev.h" - then - echo $cur_name "1" >> $config_file_path - else - echo $cur_name "2" >> $config_file_path - fi -} - -apply() { - case "$1" in - "1") - add_function " - static inline int cas_is_rq_type_fs(struct request *rq) - { - return rq->cmd_type == REQ_TYPE_FS; - }" ;; - "2") - add_function " - static inline int cas_is_rq_type_fs(struct request *rq) - { - switch (req_op(rq)){ - case REQ_OP_READ: - case REQ_OP_WRITE: - case REQ_OP_FLUSH: - case REQ_OP_DISCARD: - return true; - default: - return false; - } - }" ;; - *) - exit 1 - esac -} - -conf_run $@ diff --git a/configure.d/1_write_fua.conf b/configure.d/1_write_fua.conf deleted file mode 100644 index b636fec..0000000 --- a/configure.d/1_write_fua.conf +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -# -# Copyright(c) 2012-2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause-Clear -# - -. $(dirname $3)/conf_framework - -check() { - cur_name=$(basename $2) - config_file_path=$1 - if compile_module $cur_name "WRITE_FUA" "linux/fs.h" - then - if compile_module $cur_name "BIO_FUA" "linux/bio.h" - then - echo $cur_name "1" >> $config_file_path - else - echo $cur_name "2" >> $config_file_path - fi - elif compile_module $cur_name "REQ_FUA" "linux/blk_types.h" - then - echo $cur_name "3" >> $config_file_path - else - echo $cur_name "4" >> $config_file_path - fi -} - -apply() { - case "$1" in - "1") - add_define "CAS_WRITE_FUA \\ - WRITE_FUA" - add_define "CAS_IS_WRITE_FUA(flags) \\ - ((flags) & BIO_FUA)" ;; - "2") - add_define "CAS_WRITE_FUA \\ - WRITE_FUA" - add_define "CAS_IS_WRITE_FUA(flags) \\ - ((flags) & REQ_FUA)" ;; - "3") - add_define "CAS_IS_WRITE_FUA(flags) \\ - ((flags) & REQ_FUA)" - add_define "CAS_WRITE_FUA \\ - REQ_FUA" ;; - "4") - add_define "CAS_IS_WRITE_FUA(flags) \\ - 0" - add_define "CAS_WRITE_FUA \\ - WRITE_BARRIER" ;; - *) - exit 1 - esac -} - -conf_run $@ diff --git a/configure.d/2_flush_fua.conf b/configure.d/2_flush_fua.conf deleted file mode 100644 index 190ff58..0000000 --- a/configure.d/2_flush_fua.conf +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -# -# Copyright(c) 2012-2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause-Clear -# - -. $(dirname $3)/conf_framework - -check() { - cur_name=$(basename $2) - config_file_path=$1 - if compile_module $cur_name "WRITE_FLUSH_FUA" "linux/fs.h" - then - if compile_module $cur_name "BIO_FUA" "linux/bio.h" - then - echo $cur_name "1" >> $config_file_path - else - echo $cur_name "2" >> $config_file_path - fi - elif compile_module $cur_name "REQ_PREFLUSH" "linux/blk_types.h" - then - echo $cur_name "3" >> $config_file_path - else - echo $cur_name "4" >> $config_file_path - fi -} - -apply() { - case "$1" in - "1") - add_define "CAS_WRITE_FLUSH_FUA \\ - WRITE_FLUSH_FUA" - add_define "CAS_IS_WRITE_FLUSH_FUA(flags) \\ - ((BIO_FUA | BIO_FLUSH) == ((flags) & (BIO_FUA | BIO_FLUSH)))" ;; - "2") - add_define "CAS_WRITE_FLUSH_FUA \\ - WRITE_FLUSH_FUA" - add_define "CAS_IS_WRITE_FLUSH_FUA(flags) \\ - ((REQ_FUA | CAS_REQ_FLUSH) == ((flags) & (REQ_FUA | CAS_REQ_FLUSH)))" ;; - "3") - add_define "CAS_IS_WRITE_FLUSH_FUA(flags) \\ - ((REQ_PREFLUSH | REQ_FUA) == ((flags) & (REQ_PREFLUSH |REQ_FUA)))" - add_define "CAS_WRITE_FLUSH_FUA \\ - (REQ_PREFLUSH | REQ_FUA)" ;; - "4") - add_define "CAS_IS_WRITE_FLUSH_FUA(flags) \\ - 0" - add_define "CAS_WRITE_FLUSH_FUA \\ - WRITE_BARRIER" ;; - *) - exit 1 - esac -} - -conf_run $@ diff --git a/configure.d/2_write_flush.conf b/configure.d/2_write_flush.conf deleted file mode 100644 index 6d0a5d5..0000000 --- a/configure.d/2_write_flush.conf +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# -# Copyright(c) 2012-2021 Intel Corporation -# SPDX-License-Identifier: BSD-3-Clause-Clear -# - -. $(dirname $3)/conf_framework - -check() { - cur_name=$(basename $2) - config_file_path=$1 - if compile_module $cur_name "WRITE_FLUSH" "linux/fs.h" - then - if compile_module $cur_name "BIO_FLUSH" "linux/bio.h" - then - echo $cur_name "1" >> $config_file_path - else - echo $cur_name "2" >> $config_file_path - fi - elif compile_module $cur_name "REQ_PREFLUSH" "linux/blk_types.h" - then - echo $cur_name "3" >> $config_file_path - else - echo $cur_name "4" >> $config_file_path - fi -} - -apply() { - case "$1" in - "1") - add_define "CAS_RQ_IS_FLUSH(rq) \\ - ((rq)->cmd_flags & CAS_REQ_FLUSH)" - add_define "CAS_WRITE_FLUSH \\ - WRITE_FLUSH" - add_define "CAS_IS_WRITE_FLUSH(flags) \\ - ((flags) & BIO_FLUSH)" ;; - "2") - add_define "CAS_RQ_IS_FLUSH(rq) \\ - ((rq)->cmd_flags & CAS_REQ_FLUSH)" - add_define "CAS_WRITE_FLUSH \\ - WRITE_FLUSH" - add_define "CAS_IS_WRITE_FLUSH(flags) \\ - ((flags) & CAS_REQ_FLUSH)" ;; - "3") - add_define "CAS_RQ_IS_FLUSH(rq) \\ - ((rq)->cmd_flags & REQ_PREFLUSH)" - add_define "CAS_WRITE_FLUSH \\ - (REQ_OP_WRITE | REQ_PREFLUSH)" - add_define "CAS_IS_WRITE_FLUSH(flags) \\ - (CAS_WRITE_FLUSH == ((flags) & CAS_WRITE_FLUSH))" ;; - "4") - add_define "CAS_RQ_IS_FLUSH(rq) \\ - 0" - add_define "CAS_IS_WRITE_FLUSH(flags) \\ - (WRITE_BARRIER == ((flags) & WRITE_BARRIER))" - add_define "CAS_WRITE_FLUSH \\ - WRITE_BARRIER" ;; - *) - exit 1 - esac -} - -conf_run $@