diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-24 15:02:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-24 15:02:48 +0300 |
| commit | db25f440f42eca380fcdb339f51cf73633e32485 (patch) | |
| tree | d67c8ec502c2ce8b1382538545ee1b8a439dc6e2 /include/linux/fdtable.h | |
| parent | 145d92e77e6f34f53773fdb06789816ec2b6c7b3 (diff) | |
| parent | 83510441bc08bee201c0ded9d81da6dfd008d69a (diff) | |
| download | linux-db25f440f42eca380fcdb339f51cf73633e32485.tar.xz | |
Merge branch 'for-linus' into for-next
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); } |