Merge commit 'origin/master' into next

[deliverable/linux.git] / include / linux / user_namespace.h

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index 315bcd375224869a0e54cbaab27274588452d4d3..cc4f45361dbbc8a956f9a9fad2a865dc7f4add33 100644 (file)
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -13,6 +13,7 @@ struct user_namespace {
        struct kref             kref;
        struct hlist_head       uidhash_table[UIDHASH_SZ];
        struct user_struct      *creator;
+       struct work_struct      destroyer;
 };
 
 extern struct user_namespace init_user_ns;