7b3d9545f9
This reverts commitac40532ef0
, which gets us back the original cleanup of6f5391c283
. It turns out that the bug that was triggered by that commit was apparently not actually triggered by that commit at all, and just the testing conditions had changed enough to make it appear to be due to it. The real problem seems to have been found by Peter Osterlund: "pktcdvd sets it [block device size] when opening the /dev/pktcdvd device, but when the drive is later opened as /dev/scd0, there is nothing that sets it back. (Btw, 40944 is possible if the disk is a CDRW that was formatted with "cdrwtool -m 10236".) The problem is that pktcdvd opens the cd device in non-blocking mode when pktsetup is run, and doesn't close it again until pktsetup -d is run. The effect is that if you meanwhile open the cd device, blkdev.c:do_open() doesn't call bd_set_size() because bdev->bd_openers is non-zero." In particular, to repeat the bug (regardless of whether commit6f5391c283
is applied or not): " 1. Start with an empty drive. 2. pktsetup 0 /dev/scd0 3. Insert a CD containing an isofs filesystem. 4. mount /dev/pktcdvd/0 /mnt/tmp 5. umount /mnt/tmp 6. Press the eject button. 7. Insert a DVD containing a non-writable filesystem. 8. mount /dev/scd0 /mnt/tmp 9. find /mnt/tmp -type f -print0 | xargs -0 sha1sum >/dev/null 10. If the DVD contains data beyond the physical size of a CD, you get I/O errors in the terminal, and dmesg reports lots of "attempt to access beyond end of device" errors." which in turn is because the nested open after the media change won't cause the size to be set properly (because the original open still holds the block device, and we only do the bd_set_size() when we don't have other people holding the device open). The proper fix for that is probably to just do something like bdev->bd_inode->i_size = (loff_t)get_capacity(disk)<<9; in fs/block_dev.c:do_open() even for the cases where we're not the original opener (but *not* call bd_set_size(), since that will also change the block size of the device). Cc: Peter Osterlund <petero2@telia.com> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Ingo Molnar <mingo@elte.hu> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
155 lines
4.7 KiB
C
155 lines
4.7 KiB
C
#ifndef _SCSI_SCSI_CMND_H
|
|
#define _SCSI_SCSI_CMND_H
|
|
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/list.h>
|
|
#include <linux/types.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/scatterlist.h>
|
|
|
|
struct request;
|
|
struct scatterlist;
|
|
struct Scsi_Host;
|
|
struct scsi_device;
|
|
|
|
|
|
/* embedded in scsi_cmnd */
|
|
struct scsi_pointer {
|
|
char *ptr; /* data pointer */
|
|
int this_residual; /* left in this buffer */
|
|
struct scatterlist *buffer; /* which buffer */
|
|
int buffers_residual; /* how many buffers left */
|
|
|
|
dma_addr_t dma_handle;
|
|
|
|
volatile int Status;
|
|
volatile int Message;
|
|
volatile int have_data_in;
|
|
volatile int sent_command;
|
|
volatile int phase;
|
|
};
|
|
|
|
struct scsi_cmnd {
|
|
struct scsi_device *device;
|
|
struct list_head list; /* scsi_cmnd participates in queue lists */
|
|
struct list_head eh_entry; /* entry for the host eh_cmd_q */
|
|
int eh_eflags; /* Used by error handlr */
|
|
|
|
/*
|
|
* A SCSI Command is assigned a nonzero serial_number before passed
|
|
* to the driver's queue command function. The serial_number is
|
|
* cleared when scsi_done is entered indicating that the command
|
|
* has been completed. It is a bug for LLDDs to use this number
|
|
* for purposes other than printk (and even that is only useful
|
|
* for debugging).
|
|
*/
|
|
unsigned long serial_number;
|
|
|
|
/*
|
|
* This is set to jiffies as it was when the command was first
|
|
* allocated. It is used to time how long the command has
|
|
* been outstanding
|
|
*/
|
|
unsigned long jiffies_at_alloc;
|
|
|
|
int retries;
|
|
int allowed;
|
|
int timeout_per_command;
|
|
|
|
unsigned char cmd_len;
|
|
enum dma_data_direction sc_data_direction;
|
|
|
|
/* These elements define the operation we are about to perform */
|
|
#define MAX_COMMAND_SIZE 16
|
|
unsigned char cmnd[MAX_COMMAND_SIZE];
|
|
unsigned request_bufflen; /* Actual request size */
|
|
|
|
struct timer_list eh_timeout; /* Used to time out the command. */
|
|
void *request_buffer; /* Actual requested buffer */
|
|
|
|
/* These elements define the operation we ultimately want to perform */
|
|
unsigned short use_sg; /* Number of pieces of scatter-gather */
|
|
unsigned short __use_sg;
|
|
|
|
unsigned underflow; /* Return error if less than
|
|
this amount is transferred */
|
|
|
|
unsigned transfersize; /* How much we are guaranteed to
|
|
transfer with each SCSI transfer
|
|
(ie, between disconnect /
|
|
reconnects. Probably == sector
|
|
size */
|
|
|
|
int resid; /* Number of bytes requested to be
|
|
transferred less actual number
|
|
transferred (0 if not supported) */
|
|
|
|
struct request *request; /* The command we are
|
|
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) */
|
|
|
|
/* Low-level done function - can be used by low-level driver to point
|
|
* to completion function. Not used by mid/upper level code. */
|
|
void (*scsi_done) (struct scsi_cmnd *);
|
|
|
|
/*
|
|
* The following fields can be written to by the host specific code.
|
|
* Everything else should be left alone.
|
|
*/
|
|
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). */
|
|
|
|
int result; /* Status code from lower level driver */
|
|
|
|
unsigned char tag; /* SCSI-II queued command tag */
|
|
};
|
|
|
|
extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
|
|
extern struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *, gfp_t);
|
|
extern void scsi_put_command(struct scsi_cmnd *);
|
|
extern void __scsi_put_command(struct Scsi_Host *, struct scsi_cmnd *,
|
|
struct device *);
|
|
extern void scsi_finish_command(struct scsi_cmnd *cmd);
|
|
extern void scsi_req_abort_cmd(struct scsi_cmnd *cmd);
|
|
|
|
extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
|
|
size_t *offset, size_t *len);
|
|
extern void scsi_kunmap_atomic_sg(void *virt);
|
|
|
|
extern struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *, gfp_t);
|
|
extern void scsi_free_sgtable(struct scsi_cmnd *);
|
|
|
|
extern int scsi_dma_map(struct scsi_cmnd *cmd);
|
|
extern void scsi_dma_unmap(struct scsi_cmnd *cmd);
|
|
|
|
#define scsi_sg_count(cmd) ((cmd)->use_sg)
|
|
#define scsi_sglist(cmd) ((struct scatterlist *)(cmd)->request_buffer)
|
|
#define scsi_bufflen(cmd) ((cmd)->request_bufflen)
|
|
|
|
static inline void scsi_set_resid(struct scsi_cmnd *cmd, int resid)
|
|
{
|
|
cmd->resid = resid;
|
|
}
|
|
|
|
static inline int scsi_get_resid(struct scsi_cmnd *cmd)
|
|
{
|
|
return cmd->resid;
|
|
}
|
|
|
|
#define scsi_for_each_sg(cmd, sg, nseg, __i) \
|
|
for_each_sg(scsi_sglist(cmd), sg, nseg, __i)
|
|
|
|
#endif /* _SCSI_SCSI_CMND_H */
|