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

Commit 0f7fc9e4 authored by Josef "Jeff" Sipek's avatar Josef "Jeff" Sipek Committed by Linus Torvalds
Browse files

[PATCH] VFS: change struct file to use struct path 



This patch changes struct file to use struct path instead of having
independent pointers to struct dentry and struct vfsmount, and converts all
users of f_{dentry,vfsmnt} in fs/ to use f_path.{dentry,mnt}.

Additionally, it adds two #define's to make the transition easier for users of
the f_dentry and f_vfsmnt.

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 b65d34fd

fs/binfmt_aout.c

+4 −4
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) 
	if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC &&

	     N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) ||

	    N_TRSIZE(ex) || N_DRSIZE(ex) ||

	    i_size_read(bprm->file->f_dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {

	    i_size_read(bprm->file->f_path.dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {

		return -ENOEXEC;

	}
@@ -389,7 +389,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs) 
		{

			printk(KERN_WARNING 

			       "fd_offset is not page aligned. Please convert program: %s\n",

			       bprm->file->f_dentry->d_name.name);

			       bprm->file->f_path.dentry->d_name.name);

			error_time = jiffies;

		}
@@ -469,7 +469,7 @@ static int load_aout_library(struct file *file) 
	int retval;

	struct exec ex;



	inode = file->f_dentry->d_inode;

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



	retval = -ENOEXEC;

	error = kernel_read(file, 0, (char *) &ex, sizeof(ex));
@@ -506,7 +506,7 @@ static int load_aout_library(struct file *file) 
		{

			printk(KERN_WARNING 

			       "N_TXTOFF is not page aligned. Please convert library: %s\n",

			       file->f_dentry->d_name.name);

			       file->f_path.dentry->d_name.name);

			error_time = jiffies;

		}

		down_write(&current->mm->mmap_sem);

fs/binfmt_elf.c

+1 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ static int maydump(struct vm_area_struct *vma) 


	/* Dump shared memory only if mapped from an anonymous file. */

	if (vma->vm_flags & VM_SHARED)

		return vma->vm_file->f_dentry->d_inode->i_nlink == 0;

		return vma->vm_file->f_path.dentry->d_inode->i_nlink == 0;



	/* If it hasn't been written to, don't write it out */

	if (!vma->anon_vma)

fs/binfmt_elf_fdpic.c

+2 −2
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params, 


dynamic_error:

	printk("ELF FDPIC %s with invalid DYNAMIC section (inode=%lu)\n",

	       what, file->f_dentry->d_inode->i_ino);

	       what, file->f_path.dentry->d_inode->i_ino);

	return -ELIBBAD;

}
@@ -1186,7 +1186,7 @@ static int maydump(struct vm_area_struct *vma) 


	/* Dump shared memory only if mapped from an anonymous file. */

	if (vma->vm_flags & VM_SHARED) {

		if (vma->vm_file->f_dentry->d_inode->i_nlink == 0) {

		if (vma->vm_file->f_path.dentry->d_inode->i_nlink == 0) {

			kdcore("%08lx: %08lx: no (share)", vma->vm_start, vma->vm_flags);

			return 1;

		}

fs/binfmt_flat.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int load_flat_file(struct linux_binprm * bprm, 
	int ret;



	hdr = ((struct flat_hdr *) bprm->buf);		/* exec-header */

	inode = bprm->file->f_dentry->d_inode;

	inode = bprm->file->f_path.dentry->d_inode;



	text_len  = ntohl(hdr->data_start);

	data_len  = ntohl(hdr->data_end) - ntohl(hdr->data_start);

fs/binfmt_misc.c

+5 −5
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static void kill_node(Node *e) 
static ssize_t

bm_entry_read(struct file * file, char __user * buf, size_t nbytes, loff_t *ppos)

{

	Node *e = file->f_dentry->d_inode->i_private;

	Node *e = file->f_path.dentry->d_inode->i_private;

	loff_t pos = *ppos;

	ssize_t res;

	char *page;
@@ -576,7 +576,7 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer, 
				size_t count, loff_t *ppos)

{

	struct dentry *root;

	Node *e = file->f_dentry->d_inode->i_private;

	Node *e = file->f_path.dentry->d_inode->i_private;

	int res = parse_command(buffer, count);



	switch (res) {
@@ -584,7 +584,7 @@ static ssize_t bm_entry_write(struct file *file, const char __user *buffer, 
			break;

		case 2: set_bit(Enabled, &e->flags);

			break;

		case 3: root = dget(file->f_vfsmnt->mnt_sb->s_root);

		case 3: root = dget(file->f_path.mnt->mnt_sb->s_root);

			mutex_lock(&root->d_inode->i_mutex);



			kill_node(e);
@@ -610,7 +610,7 @@ static ssize_t bm_register_write(struct file *file, const char __user *buffer, 
	Node *e;

	struct inode *inode;

	struct dentry *root, *dentry;

	struct super_block *sb = file->f_vfsmnt->mnt_sb;

	struct super_block *sb = file->f_path.mnt->mnt_sb;

	int err = 0;



	e = create_entry(buffer, count);
@@ -699,7 +699,7 @@ static ssize_t bm_status_write(struct file * file, const char __user * buffer, 
	switch (res) {

		case 1: enabled = 0; break;

		case 2: enabled = 1; break;

		case 3: root = dget(file->f_vfsmnt->mnt_sb->s_root);

		case 3: root = dget(file->f_path.mnt->mnt_sb->s_root);

			mutex_lock(&root->d_inode->i_mutex);



			while (!list_empty(&entries))