pstore: Be thread safe and ultra safe
Merge commit 'e6f31d4346909383a4f8173b85931388df71cd4f'