Skip to content

Commit

Permalink
pstore: fix one type of return value in pstore
Browse files Browse the repository at this point in the history
the return type of function _read_ in pstore is size_t,
but in the callback function of _read_, the logic doesn't
consider it too much, which means if negative value (assuming
error here) is returned, it will be converted to positive because
of type casting. ssize_t is enough for this function.

Signed-off-by: Chen Gong <[email protected]>
Signed-off-by: Tony Luck <[email protected]>
  • Loading branch information
Chen Gong authored and aegl committed May 16, 2011
1 parent 693d92a commit 8d38d74
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/apei/erst.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ static int erst_check_table(struct acpi_table_erst *erst_tab)
return 0;
}

static size_t erst_reader(u64 *id, enum pstore_type_id *type,
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
struct timespec *time);
static u64 erst_writer(enum pstore_type_id type, size_t size);

Expand Down Expand Up @@ -957,7 +957,7 @@ struct cper_pstore_record {
char data[];
} __packed;

static size_t erst_reader(u64 *id, enum pstore_type_id *type,
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type,
struct timespec *time)
{
int rc;
Expand Down
4 changes: 2 additions & 2 deletions fs/pstore/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(pstore_register);
void pstore_get_records(void)
{
struct pstore_info *psi = psinfo;
size_t size;
ssize_t size;
u64 id;
enum pstore_type_id type;
struct timespec time;
Expand All @@ -163,7 +163,7 @@ void pstore_get_records(void)

mutex_lock(&psinfo->buf_mutex);
while ((size = psi->read(&id, &type, &time)) > 0) {
if (pstore_mkfile(type, psi->name, id, psi->buf, size,
if (pstore_mkfile(type, psi->name, id, psi->buf, (size_t)size,
time, psi->erase))
failed++;
}
Expand Down
2 changes: 1 addition & 1 deletion include/linux/pstore.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct pstore_info {
struct mutex buf_mutex; /* serialize access to 'buf' */
char *buf;
size_t bufsize;
size_t (*read)(u64 *id, enum pstore_type_id *type,
ssize_t (*read)(u64 *id, enum pstore_type_id *type,
struct timespec *time);
u64 (*write)(enum pstore_type_id type, size_t size);
int (*erase)(u64 id);
Expand Down

0 comments on commit 8d38d74

Please sign in to comment.