git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
scsi
/
osst.c
diff --git
a/drivers/scsi/osst.c
b/drivers/scsi/osst.c
index
e3bd4bc
..
4a2fed3
100644
(file)
--- a/
drivers/scsi/osst.c
+++ b/
drivers/scsi/osst.c
@@
-4724,7
+4724,7
@@
err_out:
/* Flush the tape buffer before close */
/* Flush the tape buffer before close */
-static int os_scsi_tape_flush(struct file * filp)
+static int os_scsi_tape_flush(struct file * filp
, fl_owner_t id
)
{
int result = 0, result2;
struct osst_tape * STp = filp->private_data;
{
int result = 0, result2;
struct osst_tape * STp = filp->private_data;
@@
-5492,7
+5492,7
@@
static int __init osst_setup (char *str)
char *stp;
stp = get_options(str, ARRAY_SIZE(ints), ints);
char *stp;
stp = get_options(str, ARRAY_SIZE(ints), ints);
-
+
if (ints[0] > 0) {
for (i = 0; i < ints[0] && i < ARRAY_SIZE(parms); i++)
*parms[i].val = ints[i + 1];
if (ints[0] > 0) {
for (i = 0; i < ints[0] && i < ARRAY_SIZE(parms); i++)
*parms[i].val = ints[i + 1];
@@
-5507,7
+5507,7
@@
static int __init osst_setup (char *str)
break;
}
}
break;
}
}
- if (i >=
sizeof(parms) / sizeof(struct osst_dev_parm
))
+ if (i >=
ARRAY_SIZE(parms
))
printk(KERN_INFO "osst :I: Illegal parameter in '%s'\n",
stp);
stp = strchr(stp, ',');
printk(KERN_INFO "osst :I: Illegal parameter in '%s'\n",
stp);
stp = strchr(stp, ',');