diff options
| -rw-r--r-- | drivers/acpi/apei/erst.c | 4 | ||||
| -rw-r--r-- | fs/pstore/platform.c | 4 | ||||
| -rw-r--r-- | include/linux/pstore.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index d6cb0ff6988e..d5a89d067f98 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c | |||
| @@ -929,7 +929,7 @@ static int erst_check_table(struct acpi_table_erst *erst_tab) | |||
| 929 | return 0; | 929 | return 0; |
| 930 | } | 930 | } |
| 931 | 931 | ||
| 932 | static size_t erst_reader(u64 *id, enum pstore_type_id *type, | 932 | static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, |
| 933 | struct timespec *time); | 933 | struct timespec *time); |
| 934 | static u64 erst_writer(enum pstore_type_id type, size_t size); | 934 | static u64 erst_writer(enum pstore_type_id type, size_t size); |
| 935 | 935 | ||
| @@ -957,7 +957,7 @@ struct cper_pstore_record { | |||
| 957 | char data[]; | 957 | char data[]; |
| 958 | } __packed; | 958 | } __packed; |
| 959 | 959 | ||
| 960 | static size_t erst_reader(u64 *id, enum pstore_type_id *type, | 960 | static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, |
| 961 | struct timespec *time) | 961 | struct timespec *time) |
| 962 | { | 962 | { |
| 963 | int rc; | 963 | int rc; |
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index f835a25625ff..912403c2a93d 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c | |||
| @@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(pstore_register); | |||
| 152 | void pstore_get_records(void) | 152 | void pstore_get_records(void) |
| 153 | { | 153 | { |
| 154 | struct pstore_info *psi = psinfo; | 154 | struct pstore_info *psi = psinfo; |
| 155 | size_t size; | 155 | ssize_t size; |
| 156 | u64 id; | 156 | u64 id; |
| 157 | enum pstore_type_id type; | 157 | enum pstore_type_id type; |
| 158 | struct timespec time; | 158 | struct timespec time; |
| @@ -163,7 +163,7 @@ void pstore_get_records(void) | |||
| 163 | 163 | ||
| 164 | mutex_lock(&psinfo->buf_mutex); | 164 | mutex_lock(&psinfo->buf_mutex); |
| 165 | while ((size = psi->read(&id, &type, &time)) > 0) { | 165 | while ((size = psi->read(&id, &type, &time)) > 0) { |
| 166 | if (pstore_mkfile(type, psi->name, id, psi->buf, size, | 166 | if (pstore_mkfile(type, psi->name, id, psi->buf, (size_t)size, |
| 167 | time, psi->erase)) | 167 | time, psi->erase)) |
| 168 | failed++; | 168 | failed++; |
| 169 | } | 169 | } |
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index 41977737bb7d..14ce2f5d08af 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h | |||
| @@ -35,7 +35,7 @@ struct pstore_info { | |||
| 35 | struct mutex buf_mutex; /* serialize access to 'buf' */ | 35 | struct mutex buf_mutex; /* serialize access to 'buf' */ |
| 36 | char *buf; | 36 | char *buf; |
| 37 | size_t bufsize; | 37 | size_t bufsize; |
| 38 | size_t (*read)(u64 *id, enum pstore_type_id *type, | 38 | ssize_t (*read)(u64 *id, enum pstore_type_id *type, |
| 39 | struct timespec *time); | 39 | struct timespec *time); |
| 40 | u64 (*write)(enum pstore_type_id type, size_t size); | 40 | u64 (*write)(enum pstore_type_id type, size_t size); |
| 41 | int (*erase)(u64 id); | 41 | int (*erase)(u64 id); |
