aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:36:50 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:43 -0500
commit1d56a96956158d0fb1902c56ffa0e38caa39bddb (patch)
tree01dce7af575d544411609c5746992bddf08e897a /fs
parent514653e25962c37b11fe648e4ef1c1130f697bcb (diff)
[PATCH] struct path: convert afs
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 'fs')
-rw-r--r--fs/afs/dir.c4
-rw-r--r--fs/afs/mntpt.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index a6ec75c56fcf..4acd04134055 100644
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -392,10 +392,10 @@ static int afs_dir_readdir(struct file *file, void *cookie, filldir_t filldir)
392 unsigned fpos; 392 unsigned fpos;
393 int ret; 393 int ret;
394 394
395 _enter("{%Ld,{%lu}}", file->f_pos, file->f_dentry->d_inode->i_ino); 395 _enter("{%Ld,{%lu}}", file->f_pos, file->f_path.dentry->d_inode->i_ino);
396 396
397 fpos = file->f_pos; 397 fpos = file->f_pos;
398 ret = afs_dir_iterate(file->f_dentry->d_inode, &fpos, cookie, filldir); 398 ret = afs_dir_iterate(file->f_path.dentry->d_inode, &fpos, cookie, filldir);
399 file->f_pos = fpos; 399 file->f_pos = fpos;
400 400
401 _leave(" = %d", ret); 401 _leave(" = %d", ret);
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 99785a79d043..f33b1a81a761 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -136,11 +136,11 @@ static int afs_mntpt_open(struct inode *inode, struct file *file)
136{ 136{
137 kenter("%p,%p{%p{%s},%s}", 137 kenter("%p,%p{%p{%s},%s}",
138 inode, file, 138 inode, file,
139 file->f_dentry->d_parent, 139 file->f_path.dentry->d_parent,
140 file->f_dentry->d_parent ? 140 file->f_path.dentry->d_parent ?
141 file->f_dentry->d_parent->d_name.name : 141 file->f_path.dentry->d_parent->d_name.name :
142 (const unsigned char *) "", 142 (const unsigned char *) "",
143 file->f_dentry->d_name.name); 143 file->f_path.dentry->d_name.name);
144 144
145 return -EREMOTE; 145 return -EREMOTE;
146} /* end afs_mntpt_open() */ 146} /* end afs_mntpt_open() */