Merge branch 'master' of /usr/src/ntfs-2.6/

[linux-2.6] / include / scsi / scsi_cmnd.h

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index bed4b7c9be99342b51203e43586dd50580825250..1ace1b9fe537328e41f9e369fa51c7cdcbd96e1a 100644 (file)
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -4,6 +4,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
 #include <linux/types.h>
+#include <linux/timer.h>
 
 struct request;
 struct scatterlist;
@@ -103,10 +104,10 @@ struct scsi_cmnd {
                                           working on */
 
 #define SCSI_SENSE_BUFFERSIZE  96
-       unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE];              /* obtained by REQUEST SENSE
-                                                * when CHECK CONDITION is
-                                                * received on original command 
-                                                * (auto-sense) */
+       unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE];
+                               /* obtained by REQUEST SENSE when
+                                * CHECK CONDITION is received on original
+                                * command (auto-sense) */
 
        /* Low-level done function - can be used by low-level driver to point
         *        to completion function.  Not used by mid/upper level code. */
@@ -119,12 +120,12 @@ struct scsi_cmnd {
        struct scsi_pointer SCp;        /* Scratchpad used by some host adapters */
 
        unsigned char *host_scribble;   /* The host adapter is allowed to
-                                          * call scsi_malloc and get some memory
-                                          * and hang it here.     The host adapter
-                                          * is also expected to call scsi_free
-                                          * to release this memory.  (The memory
-                                          * obtained by scsi_malloc is guaranteed
-                                          * to be at an address < 16Mb). */
+                                        * call scsi_malloc and get some memory
+                                        * and hang it here.  The host adapter
+                                        * is also expected to call scsi_free
+                                        * to release this memory.  (The memory
+                                        * obtained by scsi_malloc is guaranteed
+                                        * to be at an address < 16Mb). */
 
        int result;             /* Status code from lower level driver */
 
@@ -146,7 +147,7 @@ struct scsi_cmnd {
 #define SCSI_STATE_MLQUEUE         0x100b
 
 
-extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, int);
+extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
 extern void scsi_put_command(struct scsi_cmnd *);
 extern void scsi_io_completion(struct scsi_cmnd *, unsigned int, unsigned int);
 extern void scsi_finish_command(struct scsi_cmnd *cmd);