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

Commit b4d1ab58 authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert powerpc 



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

arch/powerpc/kernel/proc_ppc64.c

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ __initcall(proc_ppc64_init); 
static loff_t page_map_seek( struct file *file, loff_t off, int whence)

{

	loff_t new;

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);



	switch(whence) {

	case 0:
@@ -106,13 +106,13 @@ static loff_t page_map_seek( struct file *file, loff_t off, int whence) 
static ssize_t page_map_read( struct file *file, char __user *buf, size_t nbytes,

			      loff_t *ppos)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	return simple_read_from_buffer(buf, nbytes, ppos, dp->data, dp->size);

}



static int page_map_mmap( struct file *file, struct vm_area_struct *vma )

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);



	if ((vma->vm_end - vma->vm_start) > dp->size)

		return -EINVAL;

arch/powerpc/kernel/rtas_flash.c

+8 −8
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void free_flash_list(struct flash_block_list *f) 


static int rtas_flash_release(struct inode *inode, struct file *file)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	struct rtas_update_flash_t *uf;

	

	uf = (struct rtas_update_flash_t *) dp->data;
@@ -255,7 +255,7 @@ static void get_flash_status_msg(int status, char *buf) 
static ssize_t rtas_flash_read(struct file *file, char __user *buf,

			       size_t count, loff_t *ppos)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	struct rtas_update_flash_t *uf;

	char msg[RTAS_MSG_MAXLEN];

	int msglen;
@@ -299,7 +299,7 @@ void rtas_block_ctor(void *ptr, struct kmem_cache *cache, unsigned long flags) 
static ssize_t rtas_flash_write(struct file *file, const char __user *buffer,

				size_t count, loff_t *off)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	struct rtas_update_flash_t *uf;

	char *p;

	int next_free;
@@ -391,7 +391,7 @@ static void manage_flash(struct rtas_manage_flash_t *args_buf) 
static ssize_t manage_flash_read(struct file *file, char __user *buf,

			       size_t count, loff_t *ppos)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	struct rtas_manage_flash_t *args_buf;

	char msg[RTAS_MSG_MAXLEN];

	int msglen;
@@ -421,7 +421,7 @@ static ssize_t manage_flash_read(struct file *file, char __user *buf, 
static ssize_t manage_flash_write(struct file *file, const char __user *buf,

				size_t count, loff_t *off)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	struct rtas_manage_flash_t *args_buf;

	const char reject_str[] = "0";

	const char commit_str[] = "1";
@@ -492,7 +492,7 @@ static int get_validate_flash_msg(struct rtas_validate_flash_t *args_buf, 
static ssize_t validate_flash_read(struct file *file, char __user *buf,

			       size_t count, loff_t *ppos)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	struct rtas_validate_flash_t *args_buf;

	char msg[RTAS_MSG_MAXLEN];

	int msglen;
@@ -520,7 +520,7 @@ static ssize_t validate_flash_read(struct file *file, char __user *buf, 
static ssize_t validate_flash_write(struct file *file, const char __user *buf,

				    size_t count, loff_t *off)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	struct rtas_validate_flash_t *args_buf;

	int rc;
@@ -569,7 +569,7 @@ static ssize_t validate_flash_write(struct file *file, const char __user *buf, 


static int validate_flash_release(struct inode *inode, struct file *file)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	struct rtas_validate_flash_t *args_buf;



	args_buf = (struct rtas_validate_flash_t *) dp->data;

arch/powerpc/platforms/cell/spufs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int spufs_dir_close(struct inode *inode, struct file *file) 
	struct dentry *dir;

	int ret;



	dir = file->f_dentry;

	dir = file->f_path.dentry;

	parent = dir->d_parent->d_inode;

	ctx = SPUFS_I(dir->d_inode)->i_ctx;
@@ -363,7 +363,7 @@ static int spufs_gang_close(struct inode *inode, struct file *file) 
	struct dentry *dir;

	int ret;



	dir = file->f_dentry;

	dir = file->f_path.dentry;

	parent = dir->d_parent->d_inode;



	ret = spufs_rmgang(parent, dir);

arch/powerpc/platforms/cell/spufs/syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static long do_spu_run(struct file *filp, 
	if (filp->f_op != &spufs_context_fops)

		goto out;



	i = SPUFS_I(filp->f_dentry->d_inode);

	i = SPUFS_I(filp->f_path.dentry->d_inode);

	ret = spufs_run_spu(filp, i->i_ctx, &npc, &status);



	if (put_user(npc, unpc))

arch/powerpc/platforms/iseries/mf.c

+1 −1
Original line number Diff line number Diff line
@@ -1178,7 +1178,7 @@ static ssize_t proc_mf_change_vmlinux(struct file *file, 
				      const char __user *buf,

				      size_t count, loff_t *ppos)

{

	struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode);

	struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);

	ssize_t rc;

	dma_addr_t dma_addr;

	char *page;