Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

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

diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
index b9cf6c51b18106ebe2d6d715d6a1804e76ef900b..918b117a7cd303163796af02289afda4eae585ef 100644 (file)
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -19,7 +19,7 @@ struct pidmap {
 #define BITS_PER_PAGE_MASK     (BITS_PER_PAGE-1)
 #define PIDMAP_ENTRIES         ((PID_MAX_LIMIT+BITS_PER_PAGE-1)/BITS_PER_PAGE)
 
-struct bsd_acct_struct;
+struct fs_pin;
 
 struct pid_namespace {
        struct kref kref;
@@ -37,7 +37,7 @@ struct pid_namespace {
        struct dentry *proc_thread_self;
 #endif
 #ifdef CONFIG_BSD_PROCESS_ACCT
-       struct bsd_acct_struct *bacct;
+       struct fs_pin *bacct;
 #endif
        struct user_namespace *user_ns;
        struct work_struct proc_work;