mode_t whack-a-mole: task_dump_owner()

[sfrench/cifs-2.6.git] / fs / proc / internal.h

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 2cbfcd32e884478c9806c64986874bf49bd8ed8e..5bc75e56a8defd6a984856781db75a543080b11b 100644 (file)
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -40,7 +40,7 @@ struct proc_dir_entry {
        const struct inode_operations *proc_iops;
        const struct file_operations *proc_fops;
        struct proc_dir_entry *parent;
-       struct rb_root subdir;
+       struct rb_root_cached subdir;
        struct rb_node subdir_node;
        void *data;
        atomic_t count;         /* use count */
@@ -100,7 +100,7 @@ static inline struct task_struct *get_proc_task(struct inode *inode)
        return get_pid_task(proc_pid(inode), PIDTYPE_PID);
 }
 
-void task_dump_owner(struct task_struct *task, mode_t mode,
+void task_dump_owner(struct task_struct *task, umode_t mode,
                     kuid_t *ruid, kgid_t *rgid);
 
 static inline unsigned name_to_int(const struct qstr *qstr)