summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-09-12 14:23:02 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2016-09-12 14:23:02 +1000
commit13b70c812411974e62cea7daee8125125e215537 (patch)
tree4d780a5ca61139c24e90a98d630f7d9ea6d190a3 /fs
parent608a378e9005c9833fc8846bfd01a1128c4a761e (diff)
parent33b69bc53b00c693830405f6539bd8bdf58ebc1a (diff)
downloadlinux-13b70c812411974e62cea7daee8125125e215537.tar.gz
linux-13b70c812411974e62cea7daee8125125e215537.tar.xz
Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
Diffstat (limited to 'fs')
-rw-r--r--fs/char_dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c
index 6edd825231c5..44a240c4bb65 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -406,6 +406,7 @@ void cd_forget(struct inode *inode)
spin_lock(&cdev_lock);
list_del_init(&inode->i_devices);
inode->i_cdev = NULL;
+ inode->i_mapping = &inode->i_data;
spin_unlock(&cdev_lock);
}