Merge tag 'driver-core-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

torvalds · torvalds · commit 9e54ef9da519 · 2017-03-26T11:05:42.000-07:00
Pull driver core fix from Greg KH:
 "Here is a single kernfs fix for 4.11-rc4 that resolves a reported
  issue.

  It has been in linux-next with no reported issues"

* tag 'driver-core-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  kernfs: Check KERNFS_HAS_RELEASE before calling kernfs_release_file()
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,8 @@ void kernfs_drain_open_files(struct kernfs_node *kn)`
`809`	`809`	`if (kn->flags & KERNFS_HAS_MMAP)`
`810`	`810`	`unmap_mapping_range(inode->i_mapping, 0, 0, 1);`
`811`	`811`
`812`		`- kernfs_release_file(kn, of);`
	`812`	`+ if (kn->flags & KERNFS_HAS_RELEASE)`
	`813`	`+ kernfs_release_file(kn, of);`
`813`	`814`	`}`
`814`	`815`
`815`	`816`	`mutex_unlock(&kernfs_open_file_mutex);`