The first approximation to update to 2.6.27 + minor fixes, particularly remove of...
authorvlnb <vlnb@d57e44dd-8a1f-0410-8b47-8ef2f437770f>
Tue, 21 Oct 2008 11:51:52 +0000 (11:51 +0000)
committervlnb <vlnb@d57e44dd-8a1f-0410-8b47-8ef2f437770f>
Tue, 21 Oct 2008 11:51:52 +0000 (11:51 +0000)
git-svn-id: https://scst.svn.sourceforge.net/svnroot/scst/trunk@529 d57e44dd-8a1f-0410-8b47-8ef2f437770f

12 files changed:
iscsi-scst/kernel/patches/put_page_callback-2.6.27.patch [new file with mode: 0644]
mpt/Makefile
qla2x00t/qla2x00-target/Makefile
scst/include/scst.h
scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.27.patch [new file with mode: 0644]
scst/kernel/in-tree/Makefile.drivers.Linux-2.6.27.patch [new file with mode: 0644]
scst/kernel/scst_exec_req_fifo-2.6.27.patch [new file with mode: 0644]
scst/src/Makefile
scst/src/dev_handlers/Makefile
scst/src/dev_handlers/scst_user.c
scst/src/scst_main.c
scst_local/Makefile

diff --git a/iscsi-scst/kernel/patches/put_page_callback-2.6.27.patch b/iscsi-scst/kernel/patches/put_page_callback-2.6.27.patch
new file mode 100644 (file)
index 0000000..74a2dc7
--- /dev/null
@@ -0,0 +1,308 @@
+diff -upr linux-2.6.26/include/linux/mm_types.h linux-2.6.26/include/linux/mm_types.h
+--- linux-2.6.26/include/linux/mm_types.h      2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/include/linux/mm_types.h      2008-07-22 20:30:21.000000000 +0400
+@@ -92,6 +92,18 @@ struct page {
+       void *virtual;                  /* Kernel virtual address (NULL if
+                                          not kmapped, ie. highmem) */
+ #endif /* WANT_PAGE_VIRTUAL */
++
++#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
++      /*
++       * Used to implement support for notification on zero-copy TCP transfer
++       * completion. It might look as not good to have this field here and
++       * it's better to have it in struct sk_buff, but it would make the code
++       * much more complicated and fragile, since all skb then would have to
++       * contain only pages with the same value in this field.
++       */
++       void *net_priv;
++#endif
++
+ #ifdef CONFIG_CGROUP_MEM_RES_CTLR
+       unsigned long page_cgroup;
+ #endif
+diff -upr linux-2.6.26/include/linux/net.h linux-2.6.26/include/linux/net.h
+--- linux-2.6.26/include/linux/net.h   2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/include/linux/net.h   2008-07-29 20:48:07.000000000 +0400
+@@ -57,6 +57,7 @@ typedef enum {
+ #include <linux/random.h>
+ #include <linux/wait.h>
+ #include <linux/fcntl.h>      /* For O_CLOEXEC and O_NONBLOCK */
++#include <linux/mm.h>
+
+ struct poll_table_struct;
+ struct pipe_inode_info;
+@@ -354,5 +354,44 @@ extern int net_msg_cost;
+ extern struct ratelimit_state net_ratelimit_state;
+ #endif
+
++#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
++/* Support for notification on zero-copy TCP transfer completion */
++typedef void (*net_get_page_callback_t)(struct page *page);
++typedef void (*net_put_page_callback_t)(struct page *page);
++
++extern net_get_page_callback_t net_get_page_callback;
++extern net_put_page_callback_t net_put_page_callback;
++
++extern int net_set_get_put_page_callbacks(
++      net_get_page_callback_t get_callback,
++      net_put_page_callback_t put_callback);
++
++/*
++ * See comment for net_set_get_put_page_callbacks() why those functions
++ * don't need any protection.
++ */
++static inline void net_get_page(struct page *page)
++{
++      if (page->net_priv != 0)
++              net_get_page_callback(page);
++      get_page(page);
++}
++static inline void net_put_page(struct page *page)
++{
++      if (page->net_priv != 0)
++              net_put_page_callback(page);
++      put_page(page);
++}
++#else
++static inline void net_get_page(struct page *page)
++{
++      get_page(page);
++}
++static inline void net_put_page(struct page *page)
++{
++      put_page(page);
++}
++#endif /* CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION */
++
+ #endif /* __KERNEL__ */
+ #endif        /* _LINUX_NET_H */
+diff -upr linux-2.6.26/net/core/skbuff.c linux-2.6.26/net/core/skbuff.c
+--- linux-2.6.26/net/core/skbuff.c     2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/net/core/skbuff.c     2008-07-22 20:28:41.000000000 +0400
+@@ -319,7 +319,7 @@ static void skb_release_data(struct sk_b
+               if (skb_shinfo(skb)->nr_frags) {
+                       int i;
+                       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
+-                              put_page(skb_shinfo(skb)->frags[i].page);
++                              net_put_page(skb_shinfo(skb)->frags[i].page);
+               }
+               if (skb_shinfo(skb)->frag_list)
+@@ -658,7 +658,7 @@ struct sk_buff *pskb_copy(struct sk_buff
+               for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+                       skb_shinfo(n)->frags[i] = skb_shinfo(skb)->frags[i];
+-                      get_page(skb_shinfo(n)->frags[i].page);
++                      net_get_page(skb_shinfo(n)->frags[i].page);
+               }
+               skb_shinfo(n)->nr_frags = i;
+       }
+@@ -721,7 +721,7 @@ int pskb_expand_head(struct sk_buff *skb
+              sizeof(struct skb_shared_info));
+       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
+-              get_page(skb_shinfo(skb)->frags[i].page);
++              net_get_page(skb_shinfo(skb)->frags[i].page);
+       if (skb_shinfo(skb)->frag_list)
+               skb_clone_fraglist(skb);
+@@ -990,7 +990,7 @@ drop_pages:
+               skb_shinfo(skb)->nr_frags = i;
+               for (; i < nfrags; i++)
+-                      put_page(skb_shinfo(skb)->frags[i].page);
++                      net_put_page(skb_shinfo(skb)->frags[i].page);
+               if (skb_shinfo(skb)->frag_list)
+                       skb_drop_fraglist(skb);
+@@ -1159,7 +1159,7 @@ pull_pages:
+       k = 0;
+       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+               if (skb_shinfo(skb)->frags[i].size <= eat) {
+-                      put_page(skb_shinfo(skb)->frags[i].page);
++                      net_put_page(skb_shinfo(skb)->frags[i].page);
+                       eat -= skb_shinfo(skb)->frags[i].size;
+               } else {
+                       skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i];
+@@ -1916,7 +1916,7 @@ static inline void skb_split_no_header(s
+                                *    where splitting is expensive.
+                                * 2. Split is accurately. We make this.
+                                */
+-                              get_page(skb_shinfo(skb)->frags[i].page);
++                              net_get_page(skb_shinfo(skb)->frags[i].page);
+                               skb_shinfo(skb1)->frags[0].page_offset += len - pos;
+                               skb_shinfo(skb1)->frags[0].size -= len - pos;
+                               skb_shinfo(skb)->frags[i].size  = len - pos;
+@@ -2284,7 +2284,7 @@ struct sk_buff *skb_segment(struct sk_bu
+                       BUG_ON(i >= nfrags);
+                       *frag = skb_shinfo(skb)->frags[i];
+-                      get_page(frag->page);
++                      net_get_page(frag->page);
+                       size = frag->size;
+                       if (pos < offset) {
+diff -upr linux-2.6.26/net/ipv4/ip_output.c linux-2.6.26/net/ipv4/ip_output.c
+--- linux-2.6.26/net/ipv4/ip_output.c  2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/net/ipv4/ip_output.c  2008-07-22 20:28:41.000000000 +0400
+@@ -1007,7 +1007,7 @@ alloc_new_skb:
+                                               err = -EMSGSIZE;
+                                               goto error;
+                                       }
+-                                      get_page(page);
++                                      net_get_page(page);
+                                       skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);
+                                       frag = &skb_shinfo(skb)->frags[i];
+                               }
+@@ -1165,7 +1165,7 @@ ssize_t  ip_append_page(struct sock *sk, 
+               if (skb_can_coalesce(skb, i, page, offset)) {
+                       skb_shinfo(skb)->frags[i-1].size += len;
+               } else if (i < MAX_SKB_FRAGS) {
+-                      get_page(page);
++                      net_get_page(page);
+                       skb_fill_page_desc(skb, i, page, offset, len);
+               } else {
+                       err = -EMSGSIZE;
+diff -upr linux-2.6.26/net/ipv4/Makefile linux-2.6.26/net/ipv4/Makefile
+--- linux-2.6.26/net/ipv4/Makefile     2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/net/ipv4/Makefile     2008-07-22 20:35:05.000000000 +0400
+@@ -50,6 +50,7 @@ obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o
+ obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o
+ obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o
+ obj-$(CONFIG_NETLABEL) += cipso_ipv4.o
++obj-$(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) += tcp_zero_copy.o
+ obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \
+                     xfrm4_output.o
+diff -upr linux-2.6.26/net/ipv4/tcp.c linux-2.6.26/net/ipv4/tcp.c
+--- linux-2.6.26/net/ipv4/tcp.c        2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/net/ipv4/tcp.c        2008-07-22 20:28:41.000000000 +0400
+@@ -712,7 +712,7 @@ new_segment:
+               if (can_coalesce) {
+                       skb_shinfo(skb)->frags[i - 1].size += copy;
+               } else {
+-                      get_page(page);
++                      net_get_page(page);
+                       skb_fill_page_desc(skb, i, page, offset, copy);
+               }
+@@ -917,7 +917,7 @@ new_segment:
+                                       goto new_segment;
+                               } else if (page) {
+                                       if (off == PAGE_SIZE) {
+-                                              put_page(page);
++                                              net_put_page(page);
+                                               TCP_PAGE(sk) = page = NULL;
+                                               off = 0;
+                                       }
+@@ -958,9 +958,9 @@ new_segment:
+                               } else {
+                                       skb_fill_page_desc(skb, i, page, off, copy);
+                                       if (TCP_PAGE(sk)) {
+-                                              get_page(page);
++                                              net_get_page(page);
+                                       } else if (off + copy < PAGE_SIZE) {
+-                                              get_page(page);
++                                              net_get_page(page);
+                                               TCP_PAGE(sk) = page;
+                                       }
+                               }
+diff -upr linux-2.6.26/net/ipv4/tcp_output.c linux-2.6.26/net/ipv4/tcp_output.c
+--- linux-2.6.26/net/ipv4/tcp_output.c 2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/net/ipv4/tcp_output.c 2008-07-22 20:28:41.000000000 +0400
+@@ -854,7 +854,7 @@ static void __pskb_trim_head(struct sk_b
+       k = 0;
+       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+               if (skb_shinfo(skb)->frags[i].size <= eat) {
+-                      put_page(skb_shinfo(skb)->frags[i].page);
++                      net_put_page(skb_shinfo(skb)->frags[i].page);
+                       eat -= skb_shinfo(skb)->frags[i].size;
+               } else {
+                       skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i];
+diff -upr linux-2.6.26/net/ipv4/tcp_zero_copy.c linux-2.6.26/net/ipv4/tcp_zero_copy.c
+--- linux-2.6.26/net/ipv4/tcp_zero_copy.c      2008-07-22 20:12:35.000000000 +0400
++++ linux-2.6.26/net/ipv4/tcp_zero_copy.c      2008-07-31 21:21:13.000000000 +0400
+@@ -0,0 +1,49 @@
++/*
++ *    Support routines for TCP zero copy transmit
++ *
++ *    Created by Vladislav Bolkhovitin
++ *
++ *    This program is free software; you can redistribute it and/or
++ *      modify it under the terms of the GNU General Public License
++ *      version 2 as published by the Free Software Foundation.
++ */
++
++#include <linux/skbuff.h>
++
++net_get_page_callback_t net_get_page_callback __read_mostly;
++EXPORT_SYMBOL(net_get_page_callback);
++
++net_put_page_callback_t net_put_page_callback __read_mostly;
++EXPORT_SYMBOL(net_put_page_callback);
++
++/*
++ * Caller of this function must ensure that at the moment when it's called
++ * there are no pages in the system with net_priv field set to non-zero
++ * value. Hence, this function, as well as net_get_page() and net_put_page(),
++ * don't need any protection.
++ */
++int net_set_get_put_page_callbacks(
++      net_get_page_callback_t get_callback,
++      net_put_page_callback_t put_callback)
++{
++      int res = 0;
++
++      if ((net_get_page_callback != NULL) && (get_callback != NULL) &&
++          (net_get_page_callback != get_callback)) {
++              res = -EBUSY;
++              goto out;
++      }
++
++      if ((net_put_page_callback != NULL) && (put_callback != NULL) &&
++          (net_put_page_callback != put_callback)) {
++              res = -EBUSY;
++              goto out;
++      }
++
++      net_get_page_callback = get_callback;
++      net_put_page_callback = put_callback;
++
++out:
++      return res;
++}
++EXPORT_SYMBOL(net_set_get_put_page_callbacks);
+diff -upr linux-2.6.26/net/ipv6/ip6_output.c linux-2.6.26/net/ipv6/ip6_output.c
+--- linux-2.6.26/net/ipv6/ip6_output.c 2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/net/ipv6/ip6_output.c 2008-07-22 20:28:41.000000000 +0400
+@@ -1349,7 +1349,7 @@ alloc_new_skb:
+                                               err = -EMSGSIZE;
+                                               goto error;
+                                       }
+-                                      get_page(page);
++                                      net_get_page(page);
+                                       skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);
+                                       frag = &skb_shinfo(skb)->frags[i];
+                               }
+diff -upr linux-2.6.26/net/Kconfig linux-2.6.26/net/Kconfig
+--- linux-2.6.26/net/Kconfig   2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/net/Kconfig   2008-07-29 21:15:39.000000000 +0400
+@@ -59,6 +59,18 @@ config INET
+         Short answer: say Y.
++config TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION
++      bool "TCP/IP zero-copy transfer completion notification"
++        depends on INET
++        default SCST_ISCSI
++      ---help---
++        Adds support for sending a notification upon completion of a
++          zero-copy TCP/IP transfer. This can speed up certain TCP/IP
++          software. Currently this is only used by the iSCSI target driver
++          iSCSI-SCST.
++
++          If unsure, say N.
++
+ if INET
+ source "net/ipv4/Kconfig"
+ source "net/ipv6/Kconfig"
index f87dbd6..e9a36e5 100644 (file)
@@ -58,7 +58,7 @@ tgt: Modules.symvers Module.symvers
 install: all
        $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
                modules_install
-       -depmod -a
+       -/sbin/depmod -a
 
 SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)
 ifneq ($(SCST_MOD_VERS),)
index c051c5e..e11b324 100644 (file)
@@ -67,7 +67,7 @@ tgt: Modules.symvers Module.symvers
 install: all
        $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
                modules_install
-       -depmod -a $(KVER)
+       -/sbin/depmod -a $(KVER)
 
 SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)
 ifneq ($(SCST_MOD_VERS),)
index 4adb9a5..3759a92 100644 (file)
@@ -51,10 +51,6 @@ typedef _Bool bool;
 #define false 0
 #endif
 
-#ifndef DECLARE_MUTEX_LOCKED
-#define DECLARE_MUTEX_LOCKED(name)     __DECLARE_SEMAPHORE_GENERIC(name, 0)
-#endif
-
 #define SCST_LOCAL_NAME                        "scst_lcl_drvr"
 
 /*************************************************************
diff --git a/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.27.patch b/scst/kernel/in-tree/Kconfig.drivers.Linux-2.6.27.patch
new file mode 100644 (file)
index 0000000..c259d7a
--- /dev/null
@@ -0,0 +1,12 @@
+diff -upkr -X linux-2.6.26/Documentation/dontdiff linux-2.6.26/drivers/Kconfig linux-2.6.26/drivers/Kconfig
+--- linux-2.6.26/drivers/Kconfig       2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/drivers/Kconfig       2008-07-24 14:14:46.000000000 +0400
+@@ -24,6 +24,8 @@ source "drivers/ide/Kconfig"
+ source "drivers/scsi/Kconfig"
++source "drivers/scst/Kconfig"
++
+ source "drivers/ata/Kconfig"
+ source "drivers/md/Kconfig"
diff --git a/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.27.patch b/scst/kernel/in-tree/Makefile.drivers.Linux-2.6.27.patch
new file mode 100644 (file)
index 0000000..2bb0c3c
--- /dev/null
@@ -0,0 +1,11 @@
+diff -upkr -X linux-2.6.26/Documentation/dontdiff linux-2.6.26/drivers/Makefile linux-2.6.26/drivers/Makefile
+--- linux-2.6.26/drivers/Makefile      2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/drivers/Makefile      2008-07-24 14:15:29.000000000 +0400
+@@ -39,6 +39,7 @@ obj-$(CONFIG_ATM)            += atm/
+ obj-y                         += macintosh/
+ obj-$(CONFIG_IDE)             += ide/
+ obj-$(CONFIG_SCSI)            += scsi/
++obj-$(CONFIG_SCST)            += scst/
+ obj-$(CONFIG_ATA)             += ata/
+ obj-$(CONFIG_FUSION)          += message/
+ obj-$(CONFIG_FIREWIRE)                += firewire/
diff --git a/scst/kernel/scst_exec_req_fifo-2.6.27.patch b/scst/kernel/scst_exec_req_fifo-2.6.27.patch
new file mode 100644 (file)
index 0000000..9a8cf6e
--- /dev/null
@@ -0,0 +1,112 @@
+diff -upr linux-2.6.26/drivers/scsi/scsi_lib.c linux-2.6.26/drivers/scsi/scsi_lib.c
+--- linux-2.6.26/drivers/scsi/scsi_lib.c       2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/drivers/scsi/scsi_lib.c       2008-07-31 21:20:00.000000000 +0400
+@@ -372,7 +372,7 @@ free_bios:
+ }
+ /**
+- * scsi_execute_async - insert request
++ * __scsi_execute_async - insert request
+  * @sdev:     scsi device
+  * @cmd:      scsi command
+  * @cmd_len:  length of scsi cdb
+@@ -385,11 +385,14 @@ free_bios:
+  * @privdata: data passed to done()
+  * @done:     callback function when done
+  * @gfp:      memory allocation flags
++ * @at_head:  insert request at head or tail of queue
+  */
+-int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
++static inline int __scsi_execute_async(struct scsi_device *sdev,
++                     const unsigned char *cmd,
+                      int cmd_len, int data_direction, void *buffer, unsigned bufflen,
+                      int use_sg, int timeout, int retries, void *privdata,
+-                     void (*done)(void *, char *, int, int), gfp_t gfp)
++                     void (*done)(void *, char *, int, int), gfp_t gfp,
++                     int at_head)
+ {
+       struct request *req;
+       struct scsi_io_context *sioc;
+@@ -426,7 +429,7 @@ int scsi_execute_async(struct scsi_devic
+       sioc->data = privdata;
+       sioc->done = done;
+-      blk_execute_rq_nowait(req->q, NULL, req, 1, scsi_end_async);
++      blk_execute_rq_nowait(req->q, NULL, req, at_head, scsi_end_async);
+       return 0;
+ free_req:
+@@ -435,8 +438,55 @@ free_sense:
+       kmem_cache_free(scsi_io_context_cache, sioc);
+       return DRIVER_ERROR << 24;
+ }
++
++/**
++ * scsi_execute_async - insert request
++ * @sdev:     scsi device
++ * @cmd:      scsi command
++ * @cmd_len:  length of scsi cdb
++ * @data_direction: data direction
++ * @buffer:   data buffer (this can be a kernel buffer or scatterlist)
++ * @bufflen:  len of buffer
++ * @use_sg:   if buffer is a scatterlist this is the number of elements
++ * @timeout:  request timeout in seconds
++ * @retries:  number of times to retry request
++ * @flags:    or into request flags
++ **/
++int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
++                     int cmd_len, int data_direction, void *buffer,
++                     unsigned bufflen, int use_sg, int timeout,
++                     int retries, void *privdata,
++                     void (*done)(void *, char *, int, int), gfp_t gfp)
++{
++      return __scsi_execute_async(sdev, cmd, cmd_len, data_direction, buffer,
++              bufflen, use_sg, timeout, retries, privdata, done, gfp, 1);
++}
+ EXPORT_SYMBOL_GPL(scsi_execute_async);
++/**
++ * scsi_execute_async_fifo - insert request at tail, in FIFO order
++ * @sdev:     scsi device
++ * @cmd:      scsi command
++ * @cmd_len:  length of scsi cdb
++ * @data_direction: data direction
++ * @buffer:   data buffer (this can be a kernel buffer or scatterlist)
++ * @bufflen:  len of buffer
++ * @use_sg:   if buffer is a scatterlist this is the number of elements
++ * @timeout:  request timeout in seconds
++ * @retries:  number of times to retry request
++ * @flags:    or into request flags
++ **/
++int scsi_execute_async_fifo(struct scsi_device *sdev, const unsigned char *cmd,
++                     int cmd_len, int data_direction, void *buffer,
++                     unsigned bufflen, int use_sg, int timeout, int retries,
++                     void *privdata,
++                     void (*done)(void *, char *, int, int), gfp_t gfp)
++{
++      return __scsi_execute_async(sdev, cmd, cmd_len, data_direction, buffer,
++              bufflen, use_sg, timeout, retries, privdata, done, gfp, 0);
++}
++EXPORT_SYMBOL_GPL(scsi_execute_async_fifo);
++
+ /*
+  * Function:    scsi_init_cmd_errh()
+  *
+diff -upr linux-2.6.26/include/scsi/scsi_device.h linux-2.6.26/include/scsi/scsi_device.h
+--- linux-2.6.26/include/scsi/scsi_device.h    2008-07-14 01:51:29.000000000 +0400
++++ linux-2.6.26/include/scsi/scsi_device.h    2008-07-31 21:20:39.000000000 +0400
+@@ -365,6 +365,14 @@ extern int scsi_execute_async(struct scs
+                             int timeout, int retries, void *privdata,
+                             void (*done)(void *, char *, int, int),
+                             gfp_t gfp);
++#define SCSI_EXEC_REQ_FIFO_DEFINED
++extern int scsi_execute_async_fifo(struct scsi_device *sdev,
++                            const unsigned char *cmd, int cmd_len,
++                            int data_direction, void *buffer,
++                            unsigned bufflen, int use_sg,
++                            int timeout, int retries, void *privdata,
++                            void (*done)(void *, char *, int, int),
++                            gfp_t gfp);
+ static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)
+ {
index 4652265..6efe242 100644 (file)
@@ -82,7 +82,7 @@ ifneq ($(MOD_VERS),)
        rm -f $(INSTALL_DIR_H)/Modules.symvers
        install -m 644 Module.symvers $(INSTALL_DIR_H)
 endif
-       -depmod -a $(KVER)
+       -/sbin/depmod -a $(KVER)
        @echo "****************************************************************"
        @echo "*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*"
        @echo "*!!                                                          !!*"
index 2cee734..0b7686d 100644 (file)
@@ -55,7 +55,7 @@ all:
 install: all
        $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) \
                modules_install
-       -depmod -a $(KVER)
+       -/sbin/depmod -a $(KVER)
 
 uninstall:
        rm -f $(INSTALL_DIR)/scst_*.ko
index 58e9a4a..dd08614 100644 (file)
@@ -2978,6 +2978,9 @@ static int __init init_scst_user(void)
        }
 #else
        dev = device_create(dev_user_sysfs_class, NULL, MKDEV(DEV_USER_MAJOR, 0),
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+                               NULL,
+#endif
                                DEV_USER_NAME);
        if (IS_ERR(dev)) {
                res = PTR_ERR(dev);
index 7da5b06..126d50e 100644 (file)
@@ -1847,11 +1847,6 @@ out_destroy_mgmt_cache:
 
 static void __exit exit_scst(void)
 {
-#ifdef CONFIG_LOCKDEP
-       static /* To hide the lockdep's warning about non-static key */
-#endif
-       DECLARE_MUTEX_LOCKED(shm);
-
        TRACE_ENTRY();
 
        /* ToDo: unregister_cpu_notifier() */
index 656c63a..e2a5c9f 100644 (file)
@@ -35,7 +35,7 @@ tgt: Modules.symvers Module.symvers
 install: all scst_local.ko
        $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd) BUILD_INI=m \
                modules_install
-       -depmod -a
+       -/sbin/depmod -aq $(KVER)
 
 SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)
 ifneq ($(SCST_MOD_VERS),)