From 237060989798a0a7823ba7729f744a49906c41b6 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Tue, 5 Oct 2010 18:45:20 +0000 Subject: [PATCH] Minor cleanups git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2349 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/scst.h | 2 +- scst/kernel/scst_exec_req_fifo-2.6.35.patch | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scst/include/scst.h b/scst/include/scst.h index edd5141f1..825b9a09a 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -221,7 +221,7 @@ static inline int list_is_last(const struct list_head *list, /* Dev handler's dev_done() is going to be called */ #define SCST_CMD_STATE_DEV_DONE 11 -/* Target driver's xmit_response() is going to be called */ +/* Checks before target driver's xmit_response() is called */ #define SCST_CMD_STATE_PRE_XMIT_RESP 12 /* Target driver's xmit_response() is going to be called */ diff --git a/scst/kernel/scst_exec_req_fifo-2.6.35.patch b/scst/kernel/scst_exec_req_fifo-2.6.35.patch index 87b4f2d2a..312eaf9a2 100644 --- a/scst/kernel/scst_exec_req_fifo-2.6.35.patch +++ b/scst/kernel/scst_exec_req_fifo-2.6.35.patch @@ -10,7 +10,7 @@ diff -upkr linux-2.6.35/block/blk-map.c linux-2.6.35/block/blk-map.c #include /* for struct sg_iovec */ #include "blk.h" -@@ -271,6 +273,336 @@ int blk_rq_unmap_user(struct bio *bio) +@@ -271,6 +273,338 @@ int blk_rq_unmap_user(struct bio *bio) } EXPORT_SYMBOL(blk_rq_unmap_user); @@ -263,6 +263,8 @@ diff -upkr linux-2.6.35/block/blk-map.c linux-2.6.35/block/blk-map.c + } + } + ++ res = 0; ++ + rq->buffer = NULL; +out: + return res;