Skip to content

Commit

Permalink
[PATCH] struct path: convert afs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Josef Sipek authored and Linus Torvalds committed Dec 8, 2006
1 parent 514653e commit 1d56a96
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions fs/afs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,10 @@ static int afs_dir_readdir(struct file *file, void *cookie, filldir_t filldir)
unsigned fpos;
int ret;

_enter("{%Ld,{%lu}}", file->f_pos, file->f_dentry->d_inode->i_ino);
_enter("{%Ld,{%lu}}", file->f_pos, file->f_path.dentry->d_inode->i_ino);

fpos = file->f_pos;
ret = afs_dir_iterate(file->f_dentry->d_inode, &fpos, cookie, filldir);
ret = afs_dir_iterate(file->f_path.dentry->d_inode, &fpos, cookie, filldir);
file->f_pos = fpos;

_leave(" = %d", ret);
Expand Down
8 changes: 4 additions & 4 deletions fs/afs/mntpt.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@ static int afs_mntpt_open(struct inode *inode, struct file *file)
{
kenter("%p,%p{%p{%s},%s}",
inode, file,
file->f_dentry->d_parent,
file->f_dentry->d_parent ?
file->f_dentry->d_parent->d_name.name :
file->f_path.dentry->d_parent,
file->f_path.dentry->d_parent ?
file->f_path.dentry->d_parent->d_name.name :
(const unsigned char *) "",
file->f_dentry->d_name.name);
file->f_path.dentry->d_name.name);

return -EREMOTE;
} /* end afs_mntpt_open() */
Expand Down

0 comments on commit 1d56a96

Please sign in to comment.