Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27532785 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull mode_t whack-a-mole from Al Viro:
 "For all internal uses we want umode_t, which is arch-independent;
  mode_t (or __kernel_mode_t, for that matter) is wrong outside of
  userland ABI.

  Unfortunately, that crap keeps coming back and needs to be put down
  from time to time..."

* 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  mode_t whack-a-mole: task_dump_owner()
parents d18bee42 c6eb50d2

fs/proc/base.c

+1 −1
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ const struct inode_operations proc_pid_link_inode_operations = { 


/* building an inode */



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)

{

	/* Depending on the state of dumpable compute who should own a

fs/proc/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -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);



unsigned name_to_int(const struct qstr *qstr);