Merge branch 'topic/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[sfrench/cifs-2.6.git] / include / linux / fsnotify_backend.h

diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 487246546ebebb63da20fde2eb12bd9a2914040c..e6e689b5569e6f2abf00859874645620fadd3155 100644 (file)
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -16,6 +16,7 @@
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/atomic.h>
+#include <linux/user_namespace.h>
 
 /*
  * IN_* from inotfy.h lines up EXACTLY with FS_*, this is so we can easily
@@ -170,7 +171,7 @@ struct fsnotify_group {
                struct inotify_group_private_data {
                        spinlock_t      idr_lock;
                        struct idr      idr;
-                       struct user_struct      *user;
+                       struct ucounts *ucounts;
                } inotify_data;
 #endif
 #ifdef CONFIG_FANOTIFY