fsnotify: put inode specific fields in an fsnotify_mark in a union

The addition of marks on vfs mounts will be simplified if the inode
specific parts of a mark and the vfsmnt specific parts of a mark are
actually in a union so naming can be easy.  This patch just implements the
inode struct and the union.

Signed-off-by: Eric Paris <eparis@redhat.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 8075ae708ed..3edb51cfcfb 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -193,7 +193,7 @@ static int idr_callback(int id, void *p, void *data)
          */
         if (entry)
                 printk(KERN_WARNING "entry->group=%p inode=%p wd=%d\n",
-                        entry->group, entry->inode, ientry->wd);
+                        entry->group, entry->i.inode, ientry->wd);
         return 0;
 }
 
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index a48d68a68b2..4b1587f9df3 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -445,7 +445,7 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,
         if (wd == -1) {
                 WARN_ONCE(1, "%s: ientry=%p ientry->wd=%d ientry->group=%p"
                         " ientry->inode=%p\n", __func__, ientry, ientry->wd,
-                        ientry->fsn_entry.group, ientry->fsn_entry.inode);
+                        ientry->fsn_entry.group, ientry->fsn_entry.i.inode);
                 goto out;
         }
 
@@ -454,7 +454,7 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,
         if (unlikely(!found_ientry)) {
                 WARN_ONCE(1, "%s: ientry=%p ientry->wd=%d ientry->group=%p"
                         " ientry->inode=%p\n", __func__, ientry, ientry->wd,
-                        ientry->fsn_entry.group, ientry->fsn_entry.inode);
+                        ientry->fsn_entry.group, ientry->fsn_entry.i.inode);
                 goto out;
         }
 
@@ -468,9 +468,9 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,
                         "entry->inode=%p found_ientry=%p found_ientry->wd=%d "
                         "found_ientry->group=%p found_ientry->inode=%p\n",
                         __func__, ientry, ientry->wd, ientry->fsn_entry.group,
-                        ientry->fsn_entry.inode, found_ientry, found_ientry->wd,
+                        ientry->fsn_entry.i.inode, found_ientry, found_ientry->wd,
                         found_ientry->fsn_entry.group,
-                        found_ientry->fsn_entry.inode);
+                        found_ientry->fsn_entry.i.inode);
                 goto out;
         }
 
@@ -482,7 +482,7 @@ static void inotify_remove_from_idr(struct fsnotify_group *group,
         if (unlikely(atomic_read(&ientry->fsn_entry.refcnt) < 3)) {
                 printk(KERN_ERR "%s: ientry=%p ientry->wd=%d ientry->group=%p"
                         " ientry->inode=%p\n", __func__, ientry, ientry->wd,
-                        ientry->fsn_entry.group, ientry->fsn_entry.inode);
+                        ientry->fsn_entry.group, ientry->fsn_entry.i.inode);
                 /* we can't really recover with bad ref cnting.. */
                 BUG();
         }