diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:46 -0500 |
commit | ec2e203c8297d576c74a101cebd657bc1f180dd1 (patch) | |
tree | c47f9eacbe60b7731bba054c46f5a32a3be33909 /fs/jffs2/dir.c | |
parent | 4d832d460e13dd9c2cc93739ac0fd75bd8645e93 (diff) |
[PATCH] struct path: convert jffs2
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/jffs2/dir.c')
-rw-r--r-- | fs/jffs2/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index 9def6adf4a5d..da6034d50718 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c | |||
@@ -123,11 +123,11 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
123 | { | 123 | { |
124 | struct jffs2_inode_info *f; | 124 | struct jffs2_inode_info *f; |
125 | struct jffs2_sb_info *c; | 125 | struct jffs2_sb_info *c; |
126 | struct inode *inode = filp->f_dentry->d_inode; | 126 | struct inode *inode = filp->f_path.dentry->d_inode; |
127 | struct jffs2_full_dirent *fd; | 127 | struct jffs2_full_dirent *fd; |
128 | unsigned long offset, curofs; | 128 | unsigned long offset, curofs; |
129 | 129 | ||
130 | D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_dentry->d_inode->i_ino)); | 130 | D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_path.dentry->d_inode->i_ino)); |
131 | 131 | ||
132 | f = JFFS2_INODE_INFO(inode); | 132 | f = JFFS2_INODE_INFO(inode); |
133 | c = JFFS2_SB_INFO(inode->i_sb); | 133 | c = JFFS2_SB_INFO(inode->i_sb); |
@@ -141,7 +141,7 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) | |||
141 | offset++; | 141 | offset++; |
142 | } | 142 | } |
143 | if (offset == 1) { | 143 | if (offset == 1) { |
144 | unsigned long pino = parent_ino(filp->f_dentry); | 144 | unsigned long pino = parent_ino(filp->f_path.dentry); |
145 | D1(printk(KERN_DEBUG "Dirent 1: \"..\", ino #%lu\n", pino)); | 145 | D1(printk(KERN_DEBUG "Dirent 1: \"..\", ino #%lu\n", pino)); |
146 | if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0) | 146 | if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0) |
147 | goto out; | 147 | goto out; |