diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 13:30:24 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-28 10:05:27 -0400 |
| commit | bbe56c734cc1ecccd7b2b143e1767bf2b1eafc76 (patch) | |
| tree | 808dd89ca9c62a3c7e9cc8596c4c469fac396725 /drivers/scsi/arcmsr | |
| parent | 48813cf989eb8695fe84df30207fc8ff5f15783c (diff) | |
[SCSI] arcmsr: fix up bin_attr functions
Commit
commit 2c3c8bea608866d8bd9dcf92657d57fdcac011c5
Author: Chris Wright <chrisw@sous-sol.org>
Date: Wed May 12 18:28:57 2010 -0700
sysfs: add struct file* to bin_attr callbacks
Added an extra struct file * parameter at the beginning, which the
arcmsr binary attribute additions didn't have. Fix this to prevent
nasty crashes.
Cc: Nick Cheng <nick.cheng@areca.com.tw>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/arcmsr')
| -rw-r--r-- | drivers/scsi/arcmsr/arcmsr_attr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c index 69f8346aa288..07fdfe57e38e 100644 --- a/drivers/scsi/arcmsr/arcmsr_attr.c +++ b/drivers/scsi/arcmsr/arcmsr_attr.c | |||
| @@ -59,7 +59,8 @@ | |||
| 59 | 59 | ||
| 60 | struct device_attribute *arcmsr_host_attrs[]; | 60 | struct device_attribute *arcmsr_host_attrs[]; |
| 61 | 61 | ||
| 62 | static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj, | 62 | static ssize_t arcmsr_sysfs_iop_message_read(struct file *filp, |
| 63 | struct kobject *kobj, | ||
| 63 | struct bin_attribute *bin, | 64 | struct bin_attribute *bin, |
| 64 | char *buf, loff_t off, | 65 | char *buf, loff_t off, |
| 65 | size_t count) | 66 | size_t count) |
| @@ -105,7 +106,8 @@ static ssize_t arcmsr_sysfs_iop_message_read(struct kobject *kobj, | |||
| 105 | return (allxfer_len); | 106 | return (allxfer_len); |
| 106 | } | 107 | } |
| 107 | 108 | ||
| 108 | static ssize_t arcmsr_sysfs_iop_message_write(struct kobject *kobj, | 109 | static ssize_t arcmsr_sysfs_iop_message_write(struct file *filp, |
| 110 | struct kobject *kobj, | ||
| 109 | struct bin_attribute *bin, | 111 | struct bin_attribute *bin, |
| 110 | char *buf, loff_t off, | 112 | char *buf, loff_t off, |
| 111 | size_t count) | 113 | size_t count) |
| @@ -153,7 +155,8 @@ static ssize_t arcmsr_sysfs_iop_message_write(struct kobject *kobj, | |||
| 153 | } | 155 | } |
| 154 | } | 156 | } |
| 155 | 157 | ||
| 156 | static ssize_t arcmsr_sysfs_iop_message_clear(struct kobject *kobj, | 158 | static ssize_t arcmsr_sysfs_iop_message_clear(struct file *filp, |
| 159 | struct kobject *kobj, | ||
| 157 | struct bin_attribute *bin, | 160 | struct bin_attribute *bin, |
| 158 | char *buf, loff_t off, | 161 | char *buf, loff_t off, |
| 159 | size_t count) | 162 | size_t count) |