From: Damien Le Moal
No functional change is introduced by this patch.
Signed-off-by: Damien Le Moal
---
drivers/scsi/sd.c | 60 +++
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 00b168b..db362da 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -7,20 +7,20 @@
* Subsequent revisions: Eric Youngdale
* Modification history:
* - Drew Eckhardt original
- * - Eric Youngdale add scatter-gather, multiple
+ * - Eric Youngdale add scatter-gather, multiple
* outstanding request, and other enhancements.
* Support loadable low-level scsi drivers.
- * - Jirka Hanika support more scsi disks using
+ * - Jirka Hanika support more scsi disks using
* eight major numbers.
* - Richard Gooch support devfs.
- * - Torben Mathiasen Resource allocation fixes in
+ * - Torben Mathiasen Resource allocation fixes in
*sd_init and cleanups.
* - Alex Davis Fix problem where partition info
- *not being read in sd_open. Fix problem where removable media
+ *not being read in sd_open. Fix problem where removable media
*could be ejected after sd_open.
* - Douglas Gilbert cleanup for lk 2.5.x
- * - Badari Pulavarty , Matthew Wilcox
- *, Kurt Garloff :
+ * - Badari Pulavarty , Matthew Wilcox
+ *, Kurt Garloff :
*Support 32k/1M disks.
*
* Logging policy (needs CONFIG_SCSI_LOGGING defined):
@@ -29,7 +29,7 @@
* - entering sd_ioctl: SCSI_LOG_IOCTL level 1
* - entering other commands: SCSI_LOG_HLQUEUE level 3
* Note: when the logging level is set by the user, it must be greater
- * than the level indicated above to trigger output.
+ * than the level indicated above to trigger output.
*/
#include
@@ -548,16 +548,16 @@ static struct kobject *sd_default_probe(dev_t devt, int
*partno, void *data)
/*
* Device no to disk mapping:
- *
+ *
* major disc2 disc p1
* ||.||| <- dev_t
*3120 19 8 7 4 3 0
- *
+ *
* Inside a major, we have 16k disks, however mapped non-
* contiguously. The first 16 disks are for major0, the next
- * ones with major1, ... Disk 256 is for major0 again, disk 272
- * for major1, ...
- * As we stay compatible with our numbering scheme, we can reuse
+ * ones with major1, ... Disk 256 is for major0 again, disk 272
+ * for major1, ...
+ * As we stay compatible with our numbering scheme, we can reuse
* the well-know SCSI majors 8, 65--71, 136--143.
*/
static int sd_major(int major_idx)
@@ -950,7 +950,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
if (sdp->changed) {
/*
-* quietly refuse to do anything to a changed disc until
+* quietly refuse to do anything to a changed disc until
* the changed bit has been reset
*/
/* printk("SCSI disk has been changed or is not present.
Prohibiting further I/O.\n"); */
@@ -1193,7 +1193,7 @@ static void sd_uninit_command(struct scsi_cmnd *SCpnt)
* @inode: only i_rdev member may be used
* @filp: only f_mode and f_flags may be used
*
- * Returns 0 if successful. Returns a negated errno value in case
+ * Returns 0 if successful. Returns a negated errno value in case
* of error.
*
* Note: This can be called from a user context (e.g. fsck(1) )
@@ -1261,7 +1261,7 @@ static int sd_open(struct block_device *bdev, fmode_t
mode)
error_out:
scsi_disk_put(sdkp);
- return retval;
+ return retval;
}
/**
@@ -1270,7 +1270,7 @@ static int sd_open(struct block_device *bdev, fmode_t
mode)
* @inode: only i_rdev member may be used
* @filp: only f_mode and f_flags may be used
*
- * Returns 0.
+ * Returns 0.
*
* Note: may block (uninterruptible) if error recovery is underway
* on this disk.
@@ -1344,7 +1344,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t
mode,
struct scsi_device *sdp = sdkp->device;
void __user *p = (void __user *)arg;
int error;
-
+
SCSI_LOG_IOCTL(1, sd_printk(KERN_INFO, sdkp, "sd_ioctl: disk=%s, "
"cmd=0x%x\n", disk->disk_name, cmd));
@@ -1555,9 +1555,9 @@ static void sd_rescan(struct device *dev)
#ifdef CONFIG_COMPAT
-/*
- * This gets directly called from VFS. When the ioctl
- * is