Merge branch 'master'

This commit is contained in:
Jeff Garzik
2005-10-28 12:31:34 -04:00
510 changed files with 14821 additions and 9519 deletions

View File

@@ -146,7 +146,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);

View File

@@ -45,7 +45,7 @@ struct scsi_request {
level driver) of this request */
};
extern struct scsi_request *scsi_allocate_request(struct scsi_device *, int);
extern struct scsi_request *scsi_allocate_request(struct scsi_device *, gfp_t);
extern void scsi_release_request(struct scsi_request *);
extern void scsi_wait_req(struct scsi_request *, const void *cmnd,
void *buffer, unsigned bufflen,