inotify: Remove inode pointers from debug messages

[sfrench/cifs-2.6.git] / fs / notify / inotify / inotify_user.c

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 1cf41c623be1d10220fe08e1bf5dde87632dacd7..b82a507a5367752a8d7116d5e1d1deaebd44354b 100644 (file)
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -30,7 +30,7 @@
 #include <linux/inotify.h>
 #include <linux/kernel.h> /* roundup() */
 #include <linux/namei.h> /* LOOKUP_FOLLOW */
-#include <linux/sched.h> /* struct user */
+#include <linux/sched/signal.h>
 #include <linux/slab.h> /* struct kmem_cache */
 #include <linux/syscalls.h>
 #include <linux/types.h>
@@ -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();
        }