diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-10-08 02:46:30 +0300 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-10-08 02:46:30 +0300 |
commit | e476f94482fc20a23b7b33b3d8e50f1953f71828 (patch) | |
tree | 8ac0e5812ea683b348bb70ba8c0d513e2a8f5739 /fs | |
parent | 178d6f4be8bf42b298bedf8ea2a00754100e0c4e (diff) | |
parent | 4e65e9381c7ac211ec2133e473fcbdd8656c779a (diff) | |
download | linux-e476f94482fc20a23b7b33b3d8e50f1953f71828.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); } |