mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
inotify: Remove inode pointers from debug messages
Printing inode pointers in warnings has dubious value and with future changes we won't be able to easily get them without either locking or chances we oops along the way. So just remove inode pointers from the warning messages. Reviewed-by: Miklos Szeredi <mszeredi@redhat.com> Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
5198adf649
commit
25c829afbd
|
@ -156,8 +156,8 @@ static int idr_callback(int id, void *p, void *data)
|
|||
* BUG() that was here.
|
||||
*/
|
||||
if (fsn_mark)
|
||||
printk(KERN_WARNING "fsn_mark->group=%p inode=%p wd=%d\n",
|
||||
fsn_mark->group, fsn_mark->inode, i_mark->wd);
|
||||
printk(KERN_WARNING "fsn_mark->group=%p wd=%d\n",
|
||||
fsn_mark->group, i_mark->wd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -429,18 +429,16 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,
|
|||
* if it wasn't....
|
||||
*/
|
||||
if (wd == -1) {
|
||||
WARN_ONCE(1, "%s: i_mark=%p i_mark->wd=%d i_mark->group=%p"
|
||||
" i_mark->inode=%p\n", __func__, i_mark, i_mark->wd,
|
||||
i_mark->fsn_mark.group, i_mark->fsn_mark.inode);
|
||||
WARN_ONCE(1, "%s: i_mark=%p i_mark->wd=%d i_mark->group=%p\n",
|
||||
__func__, i_mark, i_mark->wd, i_mark->fsn_mark.group);
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Lets look in the idr to see if we find it */
|
||||
found_i_mark = inotify_idr_find_locked(group, wd);
|
||||
if (unlikely(!found_i_mark)) {
|
||||
WARN_ONCE(1, "%s: i_mark=%p i_mark->wd=%d i_mark->group=%p"
|
||||
" i_mark->inode=%p\n", __func__, i_mark, i_mark->wd,
|
||||
i_mark->fsn_mark.group, i_mark->fsn_mark.inode);
|
||||
WARN_ONCE(1, "%s: i_mark=%p i_mark->wd=%d i_mark->group=%p\n",
|
||||
__func__, i_mark, i_mark->wd, i_mark->fsn_mark.group);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -451,12 +449,10 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,
|
|||
*/
|
||||
if (unlikely(found_i_mark != i_mark)) {
|
||||
WARN_ONCE(1, "%s: i_mark=%p i_mark->wd=%d i_mark->group=%p "
|
||||
"mark->inode=%p found_i_mark=%p found_i_mark->wd=%d "
|
||||
"found_i_mark->group=%p found_i_mark->inode=%p\n",
|
||||
__func__, i_mark, i_mark->wd, i_mark->fsn_mark.group,
|
||||
i_mark->fsn_mark.inode, found_i_mark, found_i_mark->wd,
|
||||
found_i_mark->fsn_mark.group,
|
||||
found_i_mark->fsn_mark.inode);
|
||||
"found_i_mark=%p found_i_mark->wd=%d "
|
||||
"found_i_mark->group=%p\n", __func__, i_mark,
|
||||
i_mark->wd, i_mark->fsn_mark.group, found_i_mark,
|
||||
found_i_mark->wd, found_i_mark->fsn_mark.group);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -466,9 +462,8 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,
|
|||
* one ref grabbed by inotify_idr_find
|
||||
*/
|
||||
if (unlikely(atomic_read(&i_mark->fsn_mark.refcnt) < 3)) {
|
||||
printk(KERN_ERR "%s: i_mark=%p i_mark->wd=%d i_mark->group=%p"
|
||||
" i_mark->inode=%p\n", __func__, i_mark, i_mark->wd,
|
||||
i_mark->fsn_mark.group, i_mark->fsn_mark.inode);
|
||||
printk(KERN_ERR "%s: i_mark=%p i_mark->wd=%d i_mark->group=%p\n",
|
||||
__func__, i_mark, i_mark->wd, i_mark->fsn_mark.group);
|
||||
/* we can't really recover with bad ref cnting.. */
|
||||
BUG();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue