projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
[linux-2.6-microblaze.git]
/
fs
/
pstore
/
inode.c
diff --git
a/fs/pstore/inode.c
b/fs/pstore/inode.c
index
93a217e
..
14658b0
100644
(file)
--- a/
fs/pstore/inode.c
+++ b/
fs/pstore/inode.c
@@
-467,7
+467,7
@@
static struct dentry *pstore_mount(struct file_system_type *fs_type,
static void pstore_kill_sb(struct super_block *sb)
{
mutex_lock(&pstore_sb_lock);
static void pstore_kill_sb(struct super_block *sb)
{
mutex_lock(&pstore_sb_lock);
- WARN_ON(pstore_sb != sb);
+ WARN_ON(pstore_sb
&& pstore_sb
!= sb);
kill_litter_super(sb);
pstore_sb = NULL;
kill_litter_super(sb);
pstore_sb = NULL;