diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 10:13:04 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-27 10:13:04 +0300 |
| commit | 57c0eabbd57e1a0872122525f6eeefe1f6529c33 (patch) | |
| tree | 788d036bfbc9c92fb7663588033f50d2d6f5c828 /fs/kernfs/file.c | |
| parent | 392910cf3f8a0161d3da45d02ea17f2910d9193b (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| download | linux-57c0eabbd57e1a0872122525f6eeefe1f6529c33.tar.xz | |
Merge 4.11-rc4 into char-misc-next
We want the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/kernfs/file.c')
| -rw-r--r-- | fs/kernfs/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 8e4dc7ab584c..ac2dfe0c5a9c 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -809,7 +809,8 @@ void kernfs_drain_open_files(struct kernfs_node *kn) if (kn->flags & KERNFS_HAS_MMAP) unmap_mapping_range(inode->i_mapping, 0, 0, 1); - kernfs_release_file(kn, of); + if (kn->flags & KERNFS_HAS_RELEASE) + kernfs_release_file(kn, of); } mutex_unlock(&kernfs_open_file_mutex); |