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

Commit 2fddfeef authored by Josef "Jeff" Sipek's avatar Josef "Jeff" Sipek Committed by Linus Torvalds
Browse files

[PATCH] proc: change uses of f_{dentry, vfsmnt} to use f_path 



Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the proc
filesystem code.

Signed-off-by: default avatarJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f427f5d5

fs/proc/base.c

+18 −18
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static struct file_operations proc_mountstats_operations = { 
static ssize_t proc_info_read(struct file * file, char __user * buf,

			  size_t count, loff_t *ppos)

{

	struct inode * inode = file->f_dentry->d_inode;

	struct inode * inode = file->f_path.dentry->d_inode;

	unsigned long page;

	ssize_t length;

	struct task_struct *task = get_proc_task(inode);
@@ -512,7 +512,7 @@ static int mem_open(struct inode* inode, struct file* file) 
static ssize_t mem_read(struct file * file, char __user * buf,

			size_t count, loff_t *ppos)

{

	struct task_struct *task = get_proc_task(file->f_dentry->d_inode);

	struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);

	char *page;

	unsigned long src = *ppos;

	int ret = -ESRCH;
@@ -584,7 +584,7 @@ static ssize_t mem_write(struct file * file, const char * buf, 
{

	int copied;

	char *page;

	struct task_struct *task = get_proc_task(file->f_dentry->d_inode);

	struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);

	unsigned long dst = *ppos;



	copied = -ESRCH;
@@ -654,7 +654,7 @@ static struct file_operations proc_mem_operations = { 
static ssize_t oom_adjust_read(struct file *file, char __user *buf,

				size_t count, loff_t *ppos)

{

	struct task_struct *task = get_proc_task(file->f_dentry->d_inode);

	struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);

	char buffer[PROC_NUMBUF];

	size_t len;

	int oom_adjust;
@@ -694,7 +694,7 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf, 
		return -EINVAL;

	if (*end == '\n')

		end++;

	task = get_proc_task(file->f_dentry->d_inode);

	task = get_proc_task(file->f_path.dentry->d_inode);

	if (!task)

		return -ESRCH;

	if (oom_adjust < task->oomkilladj && !capable(CAP_SYS_RESOURCE)) {
@@ -718,7 +718,7 @@ static struct file_operations proc_oom_adjust_operations = { 
static ssize_t proc_loginuid_read(struct file * file, char __user * buf,

				  size_t count, loff_t *ppos)

{

	struct inode * inode = file->f_dentry->d_inode;

	struct inode * inode = file->f_path.dentry->d_inode;

	struct task_struct *task = get_proc_task(inode);

	ssize_t length;

	char tmpbuf[TMPBUFLEN];
@@ -734,7 +734,7 @@ static ssize_t proc_loginuid_read(struct file * file, char __user * buf, 
static ssize_t proc_loginuid_write(struct file * file, const char __user * buf,

				   size_t count, loff_t *ppos)

{

	struct inode * inode = file->f_dentry->d_inode;

	struct inode * inode = file->f_path.dentry->d_inode;

	char *page, *tmp;

	ssize_t length;

	uid_t loginuid;
@@ -1078,7 +1078,7 @@ static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, 
	char *name, int len,

	instantiate_t instantiate, struct task_struct *task, void *ptr)

{

	struct dentry *child, *dir = filp->f_dentry;

	struct dentry *child, *dir = filp->f_path.dentry;

	struct inode *inode;

	struct qstr qname;

	ino_t ino = 0;
@@ -1157,8 +1157,8 @@ static int proc_fd_link(struct inode *inode, struct dentry **dentry, struct vfsm 
		spin_lock(&files->file_lock);

		file = fcheck_files(files, fd);

		if (file) {

			*mnt = mntget(file->f_vfsmnt);

			*dentry = dget(file->f_dentry);

			*mnt = mntget(file->f_path.mnt);

			*dentry = dget(file->f_path.dentry);

			spin_unlock(&files->file_lock);

			put_files_struct(files);

			return 0;
@@ -1293,7 +1293,7 @@ static int proc_fd_fill_cache(struct file *filp, void *dirent, filldir_t filldir 


static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)

{

	struct dentry *dentry = filp->f_dentry;

	struct dentry *dentry = filp->f_path.dentry;

	struct inode *inode = dentry->d_inode;

	struct task_struct *p = get_proc_task(inode);

	unsigned int fd, tid, ino;
@@ -1440,7 +1440,7 @@ static int proc_pident_readdir(struct file *filp, 
{

	int i;

	int pid;

	struct dentry *dentry = filp->f_dentry;

	struct dentry *dentry = filp->f_path.dentry;

	struct inode *inode = dentry->d_inode;

	struct task_struct *task = get_proc_task(inode);

	struct pid_entry *p, *last;
@@ -1496,7 +1496,7 @@ out_no_task: 
static ssize_t proc_pid_attr_read(struct file * file, char __user * buf,

				  size_t count, loff_t *ppos)

{

	struct inode * inode = file->f_dentry->d_inode;

	struct inode * inode = file->f_path.dentry->d_inode;

	unsigned long page;

	ssize_t length;

	struct task_struct *task = get_proc_task(inode);
@@ -1512,7 +1512,7 @@ static ssize_t proc_pid_attr_read(struct file * file, char __user * buf, 
		goto out;



	length = security_getprocattr(task,

				      (char*)file->f_dentry->d_name.name,

				      (char*)file->f_path.dentry->d_name.name,

				      (void*)page, count);

	if (length >= 0)

		length = simple_read_from_buffer(buf, count, ppos, (char *)page, length);
@@ -1526,7 +1526,7 @@ out_no_task: 
static ssize_t proc_pid_attr_write(struct file * file, const char __user * buf,

				   size_t count, loff_t *ppos)

{

	struct inode * inode = file->f_dentry->d_inode;

	struct inode * inode = file->f_path.dentry->d_inode;

	char *page;

	ssize_t length;

	struct task_struct *task = get_proc_task(inode);
@@ -1552,7 +1552,7 @@ static ssize_t proc_pid_attr_write(struct file * file, const char __user * buf, 
		goto out_free;



	length = security_setprocattr(task,

				      (char*)file->f_dentry->d_name.name,

				      (char*)file->f_path.dentry->d_name.name,

				      (void*)page, count);

out_free:

	free_page((unsigned long) page);
@@ -1994,7 +1994,7 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi 
int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)

{

	unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;

	struct task_struct *reaper = get_proc_task(filp->f_dentry->d_inode);

	struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);

	struct task_struct *task;

	int tgid;
@@ -2235,7 +2235,7 @@ static int proc_task_fill_cache(struct file *filp, void *dirent, filldir_t filld 
/* for the /proc/TGID/task/ directories */

static int proc_task_readdir(struct file * filp, void * dirent, filldir_t filldir)

{

	struct dentry *dentry = filp->f_dentry;

	struct dentry *dentry = filp->f_path.dentry;

	struct inode *inode = dentry->d_inode;

	struct task_struct *leader = get_proc_task(inode);

	struct task_struct *task;

fs/proc/generic.c

+5 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static ssize_t 
proc_file_read(struct file *file, char __user *buf, size_t nbytes,

	       loff_t *ppos)

{

	struct inode * inode = file->f_dentry->d_inode;

	struct inode * inode = file->f_path.dentry->d_inode;

	char 	*page;

	ssize_t	retval=0;

	int	eof=0;
@@ -203,7 +203,7 @@ static ssize_t 
proc_file_write(struct file *file, const char __user *buffer,

		size_t count, loff_t *ppos)

{

	struct inode *inode = file->f_dentry->d_inode;

	struct inode *inode = file->f_path.dentry->d_inode;

	struct proc_dir_entry * dp;

	

	dp = PDE(inode);
@@ -432,7 +432,7 @@ int proc_readdir(struct file * filp, 
	struct proc_dir_entry * de;

	unsigned int ino;

	int i;

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	int ret = 0;



	lock_kernel();
@@ -453,7 +453,7 @@ int proc_readdir(struct file * filp, 
			/* fall through */

		case 1:

			if (filldir(dirent, "..", 2, i,

				    parent_ino(filp->f_dentry),

				    parent_ino(filp->f_path.dentry),

				    DT_DIR) < 0)

				goto out;

			i++;
@@ -558,7 +558,7 @@ static void proc_kill_inodes(struct proc_dir_entry *de) 
	file_list_lock();

	list_for_each(p, &sb->s_files) {

		struct file * filp = list_entry(p, struct file, f_u.fu_list);

		struct dentry * dentry = filp->f_dentry;

		struct dentry * dentry = filp->f_path.dentry;

		struct inode * inode;

		const struct file_operations *fops;

fs/proc/nommu.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) 
	file = vma->vm_file;



	if (file) {

		struct inode *inode = vma->vm_file->f_dentry->d_inode;

		struct inode *inode = vma->vm_file->f_path.dentry->d_inode;

		dev = inode->i_sb->s_dev;

		ino = inode->i_ino;

	}
@@ -67,7 +67,7 @@ int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) 
		if (len < 1)

			len = 1;

		seq_printf(m, "%*c", len, ' ');

		seq_path(m, file->f_vfsmnt, file->f_dentry, "");

		seq_path(m, file->f_path.mnt, file->f_path.dentry, "");

	}



	seq_putc(m, '\n');

fs/proc/task_mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ int proc_exe_link(struct inode *inode, struct dentry **dentry, struct vfsmount * 
	}



	if (vma) {

		*mnt = mntget(vma->vm_file->f_vfsmnt);

		*dentry = dget(vma->vm_file->f_dentry);

		*mnt = mntget(vma->vm_file->f_path.mnt);

		*dentry = dget(vma->vm_file->f_path.dentry);

		result = 0;

	}
@@ -135,7 +135,7 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats 
	int len;



	if (file) {

		struct inode *inode = vma->vm_file->f_dentry->d_inode;

		struct inode *inode = vma->vm_file->f_path.dentry->d_inode;

		dev = inode->i_sb->s_dev;

		ino = inode->i_ino;

	}
@@ -156,7 +156,7 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats 
	 */

	if (file) {

		pad_len_spaces(m, len);

		seq_path(m, file->f_vfsmnt, file->f_dentry, "\n");

		seq_path(m, file->f_path.mnt, file->f_path.dentry, "\n");

	} else {

		const char *name = arch_vma_name(vma);

		if (!name) {

fs/proc/task_nommu.c

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ int proc_exe_link(struct inode *inode, struct dentry **dentry, struct vfsmount * 
	}



	if (vma) {

		*mnt = mntget(vma->vm_file->f_vfsmnt);

		*dentry = dget(vma->vm_file->f_dentry);

		*mnt = mntget(vma->vm_file->f_path.mnt);

		*dentry = dget(vma->vm_file->f_path.dentry);

		result = 0;

	}