diff options
Diffstat (limited to 'kernel/events/core.c')
| -rw-r--r-- | kernel/events/core.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 7541f6f85fcb..177e57c1a362 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9403,7 +9403,7 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)  		flags |= MAP_HUGETLB;  	if (file) { -		struct inode *inode; +		const struct inode *inode;  		dev_t dev;  		buf = kmalloc(PATH_MAX, GFP_KERNEL); @@ -9416,12 +9416,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)  		 * need to add enough zero bytes after the string to handle  		 * the 64bit alignment we do later.  		 */ -		name = file_path(file, buf, PATH_MAX - sizeof(u64)); +		name = d_path(file_user_path(file), buf, PATH_MAX - sizeof(u64));  		if (IS_ERR(name)) {  			name = "//toolong";  			goto cpy_name;  		} -		inode = file_inode(vma->vm_file); +		inode = file_user_inode(vma->vm_file);  		dev = inode->i_sb->s_dev;  		ino = inode->i_ino;  		gen = inode->i_generation; @@ -9492,7 +9492,7 @@ static bool perf_addr_filter_match(struct perf_addr_filter *filter,  	if (!filter->path.dentry)  		return false; -	if (d_inode(filter->path.dentry) != file_inode(file)) +	if (d_inode(filter->path.dentry) != file_user_inode(file))  		return false;  	if (filter->offset > offset + size)  | 
