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>

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 1aeb837ae41405c94c72041bbba87fa7e9d0e1a5..f310d8368a2d8b7143b143426fd3ada6db0b7659 100644 (file)
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -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;
 }
 

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 498d609b26c7dbf4d81537477b338aedc1a64156..b82a507a5367752a8d7116d5e1d1deaebd44354b 100644 (file)
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -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();
        }