Commit 5f6e8ce4 authored by Linus Torvalds's avatar Linus Torvalds

Fsck knows why the devil does st.c has to call something a partition,

but it does...
parent 165088f9
...@@ -184,7 +184,7 @@ static struct Scsi_Device_Template st_template = { ...@@ -184,7 +184,7 @@ static struct Scsi_Device_Template st_template = {
static int st_compression(Scsi_Tape *, int); static int st_compression(Scsi_Tape *, int);
static int find_partition(Scsi_Tape *); static int find_partition(Scsi_Tape *);
static int update_partition(Scsi_Tape *); static int switch_partition(Scsi_Tape *);
static int st_int_ioctl(Scsi_Tape *, unsigned int, unsigned long); static int st_int_ioctl(Scsi_Tape *, unsigned int, unsigned long);
...@@ -1028,9 +1028,9 @@ static int st_flush(struct file *filp) ...@@ -1028,9 +1028,9 @@ static int st_flush(struct file *filp)
} }
if (STp->can_partitions && if (STp->can_partitions &&
(result2 = update_partition(STp)) < 0) { (result2 = switch_partition(STp)) < 0) {
DEBC(printk(ST_DEB_MSG DEBC(printk(ST_DEB_MSG
"st%d: update_partition at close failed.\n", dev)); "st%d: switch_partition at close failed.\n", dev));
if (result == 0) if (result == 0)
result = result2; result = result2;
goto out; goto out;
...@@ -1206,7 +1206,7 @@ static ssize_t rw_checks(Scsi_Tape *STp, struct file *filp, size_t count, loff_t ...@@ -1206,7 +1206,7 @@ static ssize_t rw_checks(Scsi_Tape *STp, struct file *filp, size_t count, loff_t
} ) /* end DEB */ } ) /* end DEB */
if (STp->can_partitions && if (STp->can_partitions &&
(retval = update_partition(STp)) < 0) (retval = switch_partition(STp)) < 0)
goto out; goto out;
if (STp->block_size == 0 && STp->max_block > 0 && if (STp->block_size == 0 && STp->max_block > 0 &&
...@@ -2904,7 +2904,7 @@ static int find_partition(Scsi_Tape *STp) ...@@ -2904,7 +2904,7 @@ static int find_partition(Scsi_Tape *STp)
/* Change the partition if necessary */ /* Change the partition if necessary */
static int update_partition(Scsi_Tape *STp) static int switch_partition(Scsi_Tape *STp)
{ {
ST_partstat *STps; ST_partstat *STps;
...@@ -3239,7 +3239,7 @@ static int st_ioctl(struct inode *inode, struct file *file, ...@@ -3239,7 +3239,7 @@ static int st_ioctl(struct inode *inode, struct file *file,
} }
if (STp->can_partitions && STp->ready == ST_READY && if (STp->can_partitions && STp->ready == ST_READY &&
(i = update_partition(STp)) < 0) { (i = switch_partition(STp)) < 0) {
retval = i; retval = i;
goto out; goto out;
} }
...@@ -3260,7 +3260,7 @@ static int st_ioctl(struct inode *inode, struct file *file, ...@@ -3260,7 +3260,7 @@ static int st_ioctl(struct inode *inode, struct file *file,
goto out; goto out;
} }
if (STp->can_partitions && if (STp->can_partitions &&
(i = update_partition(STp)) < 0) { (i = switch_partition(STp)) < 0) {
retval = i; retval = i;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment