UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

debugfs: debugfs_real_fops(): drop __must_hold sparse annotation 

Currently, debugfs_real_fops() is annotated with a
__must_hold(&debugfs_srcu) sparse annotation.

With the conversion of the SRCU based protection of users against
concurrent file removals to a per-file refcount based scheme, this becomes
wrong.

Drop this annotation.

Signed-off-by: Nicolai Stange <nicstange@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nicolai Stange 2017-10-31 00:15:49 +01:00 committed by Greg Kroah-Hartman
parent e9117a5a4b
commit 055ab8e3e3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/debugfs/file.c
View File

@ -98,13 +98,9 @@ EXPORT_SYMBOL_GPL(debugfs_use_file_finish);
#define F_DENTRY(filp) ((filp)->f_path.dentry) #define F_DENTRY(filp) ((filp)->f_path.dentry)
const struct file_operations *debugfs_real_fops(const struct file *filp) const struct file_operations *debugfs_real_fops(const struct file *filp)
__must_hold(&debugfs_srcu)
{ {
struct debugfs_fsdata *fsd = F_DENTRY(filp)->d_fsdata; struct debugfs_fsdata *fsd = F_DENTRY(filp)->d_fsdata;
/*
* Neither the pointer to the struct file_operations, nor its
* contents ever change -- srcu_dereference() is not needed here.
*/
return fsd->real_fops; return fsd->real_fops;
} }
EXPORT_SYMBOL_GPL(debugfs_real_fops); EXPORT_SYMBOL_GPL(debugfs_real_fops);

3
include/linux/debugfs.h
View File

@ -95,8 +95,7 @@ int debugfs_use_file_start(const struct dentry *dentry, int *srcu_idx)
void debugfs_use_file_finish(int srcu_idx) __releases(&debugfs_srcu); void debugfs_use_file_finish(int srcu_idx) __releases(&debugfs_srcu);
const struct file_operations *debugfs_real_fops(const struct file *filp) const struct file_operations *debugfs_real_fops(const struct file *filp);
__must_hold(&debugfs_srcu);
int debugfs_file_get(struct dentry *dentry); int debugfs_file_get(struct dentry *dentry);
void debugfs_file_put(struct dentry *dentry); void debugfs_file_put(struct dentry *dentry);