aboutsummaryrefslogtreecommitdiffstats
path: root/fs/kernfs/file.c
diff options
context:
space:
mode:
authorIngo Molnar <[email protected]>2017-04-03 14:36:32 +0000
committerIngo Molnar <[email protected]>2017-04-03 14:36:32 +0000
commit7f75540ff2ca84dbac26cf9deeb620cbf5646f5e (patch)
tree1eb54748074d3a91f3dd70fb5d4b23bf713f0bd5 /fs/kernfs/file.c
parentx86/mm/numa: Remove numa_nodemask_from_meminfo() (diff)
parentLinux 4.11-rc5 (diff)
downloadkernel-7f75540ff2ca84dbac26cf9deeb620cbf5646f5e.tar.gz
kernel-7f75540ff2ca84dbac26cf9deeb620cbf5646f5e.zip
Merge tag 'v4.11-rc5' into x86/mm, to refresh the branch
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'fs/kernfs/file.c')
-rw-r--r--fs/kernfs/file.c3
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);