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>

diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 6644bfdea2f800f6fc91ce10c3a7717593721dee..08511678b78217924688c37ace29d4e405c384b8 100644 (file)
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -98,13 +98,9 @@ EXPORT_SYMBOL_GPL(debugfs_use_file_finish);
 #define F_DENTRY(filp) ((filp)->f_path.dentry)
 
 const struct file_operations *debugfs_real_fops(const struct file *filp)
-       __must_hold(&debugfs_srcu)
 {
        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;
 }
 EXPORT_SYMBOL_GPL(debugfs_real_fops);

diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 3b914d588148042d186abe499e70046aec019eb6..c5eda259b9d683f4cb088436b16757113fa78a5f 100644 (file)
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -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);
 
-const struct file_operations *debugfs_real_fops(const struct file *filp)
-       __must_hold(&debugfs_srcu);
+const struct file_operations *debugfs_real_fops(const struct file *filp);
 
 int debugfs_file_get(struct dentry *dentry);
 void debugfs_file_put(struct dentry *dentry);