X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=fs%2Fproc%2Finternal.h;h=5bc75e56a8defd6a984856781db75a543080b11b;hp=2cbfcd32e884478c9806c64986874bf49bd8ed8e;hb=c6eb50d2790478d8b5841379b9502812a5e5feb3;hpb=42c8e86c9c3e15ac653c31d57b2f985579c2991d

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 2cbfcd32e884..5bc75e56a8de 100644
--- 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)