summaryrefslogtreecommitdiff
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-26 17:50:42 -0700
committerMark Brown <broonie@kernel.org>2015-03-26 17:50:42 -0700
commit1be38e041f8eaa935f370aa0f34dd7a2fe39b1d8 (patch)
tree2d89734fc831593784bd411be03a1b9649de4c9d /mm/shmem.c
parent6935224da2482a261c786501fbccb1dc4a675225 (diff)
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff)
Merge tag 'v4.0-rc5' into spi-bcm2835
Linux 4.0-rc5
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 2f17cb5f00a4..cf2d0ca010bc 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1455,6 +1455,9 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
bool shmem_mapping(struct address_space *mapping)
{
+ if (!mapping->host)
+ return false;
+
return mapping->host->i_sb->s_op == &shmem_ops;
}