cmdfilter: extend default read filter

This patch adds the commands that the former sg filter allowed for read
access to the cmdfilter to keep userspace apps that rely on them working.

Signed-off-by: Adel Gadllah <adel.gadllah@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2 files changed, 9 insertions, 4 deletions

diff --git a/block/cmd-filter.c b/block/cmd-filter.c
index 35e327ceaa97..eec4404fd357 100644
--- a/block/cmd-filter.c
+++ b/block/cmd-filter.c
@@ -219,6 +219,10 @@ static struct kobj_type rcf_ktype = {
         .default_attrs = default_attrs,
 };
 
+#ifndef MAINTENANCE_IN_CMD
+#define MAINTENANCE_IN_CMD 0xa3
+#endif
+
 static void rcf_set_defaults(struct blk_scsi_cmd_filter *filter)
 {
         /* Basic read-only commands */
@@ -230,6 +234,7 @@ static void rcf_set_defaults(struct blk_scsi_cmd_filter *filter)
         __set_bit(READ_16, filter->read_ok);
         __set_bit(READ_BUFFER, filter->read_ok);
         __set_bit(READ_DEFECT_DATA, filter->read_ok);
+        __set_bit(READ_CAPACITY, filter->read_ok);
         __set_bit(READ_LONG, filter->read_ok);
         __set_bit(INQUIRY, filter->read_ok);
         __set_bit(MODE_SENSE, filter->read_ok);
@@ -238,6 +243,10 @@ static void rcf_set_defaults(struct blk_scsi_cmd_filter *filter)
         __set_bit(START_STOP, filter->read_ok);
         __set_bit(GPCMD_VERIFY_10, filter->read_ok);
         __set_bit(VERIFY_16, filter->read_ok);
+        __set_bit(REPORT_LUNS, filter->read_ok);
+        __set_bit(SERVICE_ACTION_IN, filter->read_ok);
+        __set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok);
+        __set_bit(MAINTENANCE_IN_CMD, filter->read_ok);
         __set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok);
 
         /* Audio CD commands */
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 62b5bd5fd761..fe694f0ee19a 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -2502,10 +2502,6 @@ sg_page_free(struct page *page, int size)
         __free_pages(page, order);
 }
 
-#ifndef MAINTENANCE_IN_CMD
-#define MAINTENANCE_IN_CMD 0xa3
-#endif
-
 #ifdef CONFIG_SCSI_PROC_FS
 static int
 sg_idr_max_id(int id, void *p, void *data)