]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
cmdfilter: extend default read filter
authorAdel Gadllah <adel.gadllah@gmail.com>
Fri, 27 Jun 2008 07:16:17 +0000 (09:16 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 3 Jul 2008 11:21:14 +0000 (13:21 +0200)
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>
block/cmd-filter.c
drivers/scsi/sg.c

index 35e327ceaa97b0686d1dbef18f25c8be699fdf44..eec4404fd35758ffba4a9903d28df12ef51aeccc 100644 (file)
@@ -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 */
index 62b5bd5fd761b03f8f31e799cc839ee6ca5c5a3b..fe694f0ee19a80a6bc2895d84970f9a8e7e264ad 100644 (file)
@@ -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)