sg: remove b_malloc_len in sg_scatter_hold struct

[linux-2.6-omap-h63xx.git] / drivers / scsi / sg.c

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index d18f90d1d9adb0d36cfb1f086714b507b13b1709..ccce31a400ea1f0e72e5d016587f98be24e8d5a4 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -68,7 +68,6 @@ static void sg_proc_cleanup(void);
 #endif
 
 #define SG_ALLOW_DIO_DEF 0
-#define SG_ALLOW_DIO_CODE /* compile out by commenting this define */
 
 #define SG_MAX_DEVS 32768
 
@@ -117,7 +116,6 @@ typedef struct sg_scatter_hold { /* holding area for scsi scatter gather info */
        unsigned short k_use_sg; /* Count of kernel scatter-gather pieces */
        unsigned sglist_len; /* size of malloc'd scatter-gather list ++ */
        unsigned bufflen;       /* Size of (aggregate) data buffer */
-       unsigned b_malloc_len;  /* actual len malloc'ed in buffer */
        struct page **pages;
        int page_order;
        char dio_in_use;        /* 0->indirect IO (or mmap), 1->dio */
@@ -1674,13 +1672,12 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd)
        if ((dxfer_len <= 0) || (dxfer_dir == SG_DXFER_NONE))
                return 0;
 
-#ifdef SG_ALLOW_DIO_CODE
        if (sg_allow_dio && (hp->flags & SG_FLAG_DIRECT_IO) &&
            (dxfer_dir != SG_DXFER_UNKNOWN) && (0 == hp->iovec_count) &&
            (!sfp->parentdp->device->host->unchecked_isa_dma) &&
            blk_rq_aligned(q, hp->dxferp, dxfer_len))
                return sg_build_direct(srp, sfp, dxfer_len);
-#endif
+
        if ((!sg_res_in_use(sfp)) && (dxfer_len <= rsv_schp->bufflen))
                sg_link_reserve(sfp, srp, dxfer_len);
        else
@@ -1988,7 +1985,6 @@ sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size)
                        req_schp->pages = rsv_schp->pages;
 
                        req_schp->bufflen = size;
-                       req_schp->b_malloc_len = rsv_schp->b_malloc_len;
                        req_schp->page_order = rsv_schp->page_order;
                        break;
                } else