# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.824   -> 1.825  
#	include/linux/blkdev.h	1.80    -> 1.81   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/28	axboe@burns.home.kernel.dk	1.825
# Add sense_len to request, so scsi_ioctl knows how much sense data
# was transferred. Add sg_timeout and sg_reserved to queue, we can't
# have these global... And finally kill QUEUE_NR_REQUESTS, it hasn't been
# used in a while.
# --------------------------------------------
#
diff -Nru a/include/linux/blkdev.h b/include/linux/blkdev.h
--- a/include/linux/blkdev.h	Mon Oct 28 18:56:14 2002
+++ b/include/linux/blkdev.h	Mon Oct 28 18:56:14 2002
@@ -66,7 +66,10 @@
 
 	/* For packet commands */
 	unsigned int data_len;
-	void *data, *sense;
+	void *data;
+
+	unsigned int sense_len;
+	void *sense;
 
 	unsigned int timeout;
 	struct completion *waiting;
@@ -152,12 +155,6 @@
 	int max_depth;
 };
 
-/*
- * Default nr free requests per queue, ll_rw_blk will scale it down
- * according to available RAM at init time
- */
-#define QUEUE_NR_REQUESTS	8192
-
 struct request_queue
 {
 	/*
@@ -222,6 +219,12 @@
 	wait_queue_head_t	queue_wait;
 
 	struct blk_queue_tag	*queue_tags;
+
+	/*
+	 * sg stuff
+	 */
+	unsigned int		sg_timeout;
+	unsigned int		sg_reserved_size;
 };
 
 #define RQ_INACTIVE		(-1)