diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-06-19 01:50:02 +0300 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-07-23 01:27:32 +0300 |
| commit | f78f5b90c4ffa559e400c3919a02236101f29f3f (patch) | |
| tree | ded8a53b5c2bc06ab532d4b9a2e6e99a12912574 /include/linux/fdtable.h | |
| parent | 46f00d18fca42cc954c2e9e99a48b6f3a7741ed7 (diff) | |
| download | linux-f78f5b90c4ffa559e400c3919a02236101f29f3f.tar.xz | |
rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN()
This commit renames rcu_lockdep_assert() to RCU_LOCKDEP_WARN() for
consistency with the WARN() series of macros. This also requires
inverting the sense of the conditional, which this commit also does.
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/fdtable.h')
| -rw-r--r-- | include/linux/fdtable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index fbb88740634a..674e3e226465 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -86,8 +86,8 @@ static inline struct file *__fcheck_files(struct files_struct *files, unsigned i static inline struct file *fcheck_files(struct files_struct *files, unsigned int fd) { - rcu_lockdep_assert(rcu_read_lock_held() || - lockdep_is_held(&files->file_lock), + RCU_LOCKDEP_WARN(!rcu_read_lock_held() && + !lockdep_is_held(&files->file_lock), "suspicious rcu_dereference_check() usage"); return __fcheck_files(files, fd); } |