diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:48 -0500 |
commit | b4d1ab58c016f4dffef4ff1eb392fa84e3c35024 (patch) | |
tree | 95229900a5bd022f89ec9a4268a5541808dbb119 /arch/powerpc/platforms | |
parent | 40fad04b224db982cce5f6226ebe3ceb6529b781 (diff) |
[PATCH] struct path: convert powerpc
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/syscalls.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/mf.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/hvCall_inst.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/scanlog.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index e3af9112c026..738b9244382f 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
@@ -205,7 +205,7 @@ static int spufs_dir_close(struct inode *inode, struct file *file) | |||
205 | struct dentry *dir; | 205 | struct dentry *dir; |
206 | int ret; | 206 | int ret; |
207 | 207 | ||
208 | dir = file->f_dentry; | 208 | dir = file->f_path.dentry; |
209 | parent = dir->d_parent->d_inode; | 209 | parent = dir->d_parent->d_inode; |
210 | ctx = SPUFS_I(dir->d_inode)->i_ctx; | 210 | ctx = SPUFS_I(dir->d_inode)->i_ctx; |
211 | 211 | ||
@@ -363,7 +363,7 @@ static int spufs_gang_close(struct inode *inode, struct file *file) | |||
363 | struct dentry *dir; | 363 | struct dentry *dir; |
364 | int ret; | 364 | int ret; |
365 | 365 | ||
366 | dir = file->f_dentry; | 366 | dir = file->f_path.dentry; |
367 | parent = dir->d_parent->d_inode; | 367 | parent = dir->d_parent->d_inode; |
368 | 368 | ||
369 | ret = spufs_rmgang(parent, dir); | 369 | ret = spufs_rmgang(parent, dir); |
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c index a6d1ae4dc2a3..8e37bdf4dfda 100644 --- a/arch/powerpc/platforms/cell/spufs/syscalls.c +++ b/arch/powerpc/platforms/cell/spufs/syscalls.c | |||
@@ -46,7 +46,7 @@ static long do_spu_run(struct file *filp, | |||
46 | if (filp->f_op != &spufs_context_fops) | 46 | if (filp->f_op != &spufs_context_fops) |
47 | goto out; | 47 | goto out; |
48 | 48 | ||
49 | i = SPUFS_I(filp->f_dentry->d_inode); | 49 | i = SPUFS_I(filp->f_path.dentry->d_inode); |
50 | ret = spufs_run_spu(filp, i->i_ctx, &npc, &status); | 50 | ret = spufs_run_spu(filp, i->i_ctx, &npc, &status); |
51 | 51 | ||
52 | if (put_user(npc, unpc)) | 52 | if (put_user(npc, unpc)) |
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c index b5737d68d6c4..cff15ae24f6b 100644 --- a/arch/powerpc/platforms/iseries/mf.c +++ b/arch/powerpc/platforms/iseries/mf.c | |||
@@ -1178,7 +1178,7 @@ static ssize_t proc_mf_change_vmlinux(struct file *file, | |||
1178 | const char __user *buf, | 1178 | const char __user *buf, |
1179 | size_t count, loff_t *ppos) | 1179 | size_t count, loff_t *ppos) |
1180 | { | 1180 | { |
1181 | struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 1181 | struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode); |
1182 | ssize_t rc; | 1182 | ssize_t rc; |
1183 | dma_addr_t dma_addr; | 1183 | dma_addr_t dma_addr; |
1184 | char *page; | 1184 | char *page; |
diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c index 446e17d162a5..80181c4c49eb 100644 --- a/arch/powerpc/platforms/pseries/hvCall_inst.c +++ b/arch/powerpc/platforms/pseries/hvCall_inst.c | |||
@@ -85,7 +85,7 @@ static int hcall_inst_seq_open(struct inode *inode, struct file *file) | |||
85 | 85 | ||
86 | rc = seq_open(file, &hcall_inst_seq_ops); | 86 | rc = seq_open(file, &hcall_inst_seq_ops); |
87 | seq = file->private_data; | 87 | seq = file->private_data; |
88 | seq->private = file->f_dentry->d_inode->i_private; | 88 | seq->private = file->f_path.dentry->d_inode->i_private; |
89 | 89 | ||
90 | return rc; | 90 | return rc; |
91 | } | 91 | } |
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c index 77a5bb1d9c30..45368a57d7dd 100644 --- a/arch/powerpc/platforms/pseries/scanlog.c +++ b/arch/powerpc/platforms/pseries/scanlog.c | |||
@@ -47,7 +47,7 @@ static struct proc_dir_entry *proc_ppc64_scan_log_dump; /* The proc file */ | |||
47 | static ssize_t scanlog_read(struct file *file, char __user *buf, | 47 | static ssize_t scanlog_read(struct file *file, char __user *buf, |
48 | size_t count, loff_t *ppos) | 48 | size_t count, loff_t *ppos) |
49 | { | 49 | { |
50 | struct inode * inode = file->f_dentry->d_inode; | 50 | struct inode * inode = file->f_path.dentry->d_inode; |
51 | struct proc_dir_entry *dp; | 51 | struct proc_dir_entry *dp; |
52 | unsigned int *data; | 52 | unsigned int *data; |
53 | int status; | 53 | int status; |