Merge tag 'for-v3.8' of git://git.infradead.org/users/cbou/linux-pstore

[~shefty/rdma-dev.git] / fs / pstore / ram.c

diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index dba70e53b72c427bcbee855203698f43955410cb..f883e7e74305c9935b2f26e27e92f01c7e138aa9 100644 (file)
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -132,9 +132,8 @@ ramoops_get_next_prz(struct persistent_ram_zone *przs[], uint *c, uint max,
 }
 
 static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,
 }
 
 static ssize_t ramoops_pstore_read(u64 *id, enum pstore_type_id *type,

-                                  struct timespec *time,
-                                  char **buf,
-                                  struct pstore_info *psi)
+                                  int *count, struct timespec *time,
+                                  char **buf, struct pstore_info *psi)

 {
        ssize_t size;
        struct ramoops_context *cxt = psi->data;
 {
        ssize_t size;
        struct ramoops_context *cxt = psi->data;


@@ -241,8 +240,8 @@ static int notrace ramoops_pstore_write_buf(enum pstore_type_id type,
        return 0;
 }
 
        return 0;
 }
 

-static int ramoops_pstore_erase(enum pstore_type_id type, u64 id,
-                               struct pstore_info *psi)
+static int ramoops_pstore_erase(enum pstore_type_id type, u64 id, int count,
+                               struct timespec time, struct pstore_info *psi)

 {
        struct ramoops_context *cxt = psi->data;
        struct persistent_ram_zone *prz;
 {
        struct ramoops_context *cxt = psi->data;
        struct persistent_ram_zone *prz;