diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 10:52:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 10:52:29 -0700 |
| commit | 1c398651518c7e25a9fb3f08b456c73d5ca22469 (patch) | |
| tree | 116ad4df5c8faa5f8e0d7982c479bf08ea01f2ec /include/linux | |
| parent | f470f8d4e702593ee1d0852871ad80373bce707b (diff) | |
| parent | b238b8fa93353ab50c9a2b1e2fa47a0ab01c37cd (diff) | |
Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: make pstore write function return normal success/fail value
pstore: change mutex locking to spin_locks
pstore: defer inserting OOPS entries into pstore
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pstore.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pstore.h b/include/linux/pstore.h index cc03bbf5c4b8..ea567321ae3c 100644 --- a/include/linux/pstore.h +++ b/include/linux/pstore.h @@ -32,15 +32,15 @@ enum pstore_type_id { struct pstore_info { struct module *owner; char *name; - struct mutex buf_mutex; /* serialize access to 'buf' */ + spinlock_t buf_lock; /* serialize access to 'buf' */ char *buf; size_t bufsize; int (*open)(struct pstore_info *psi); int (*close)(struct pstore_info *psi); ssize_t (*read)(u64 *id, enum pstore_type_id *type, struct timespec *time, struct pstore_info *psi); - u64 (*write)(enum pstore_type_id type, unsigned int part, - size_t size, struct pstore_info *psi); + int (*write)(enum pstore_type_id type, u64 *id, + unsigned int part, size_t size, struct pstore_info *psi); int (*erase)(enum pstore_type_id type, u64 id, struct pstore_info *psi); void *data; |