diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-09-09 17:35:45 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-09-09 17:35:45 -0700 |
commit | 33b69bc53b00c693830405f6539bd8bdf58ebc1a (patch) | |
tree | 0d14d7a7b02dd084fcaa80b69ddf69ac607a8eaf /fs | |
parent | 065ef019bc1e8f78f835b958c4dc55f24ed884a1 (diff) | |
parent | 72ffa4d2dfd31fee9af15c2471b55006c0b24a66 (diff) | |
download | linux-33b69bc53b00c693830405f6539bd8bdf58ebc1a.tar.gz linux-33b69bc53b00c693830405f6539bd8bdf58ebc1a.tar.xz |
Merge branch 'for-4.9/dax' into libnvdimm-for-next
Diffstat (limited to 'fs')
-rw-r--r-- | fs/char_dev.c | 1 |
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); } |