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

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

[PATCH] struct path: convert jffs2 



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 4d832d46

fs/jffs2/dir.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -123,11 +123,11 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) 
{

{

	struct jffs2_inode_info *f;

	struct jffs2_inode_info *f;

	struct jffs2_sb_info *c;

	struct jffs2_sb_info *c;

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct jffs2_full_dirent *fd;

	struct jffs2_full_dirent *fd;

	unsigned long offset, curofs;

	unsigned long offset, curofs;





	D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_dentry->d_inode->i_ino));

	D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_path.dentry->d_inode->i_ino));





	f = JFFS2_INODE_INFO(inode);

	f = JFFS2_INODE_INFO(inode);

	c = JFFS2_SB_INFO(inode->i_sb);

	c = JFFS2_SB_INFO(inode->i_sb);
@@ -141,7 +141,7 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) 
		offset++;

		offset++;

	}

	}

	if (offset == 1) {

	if (offset == 1) {

		unsigned long pino = parent_ino(filp->f_dentry);

		unsigned long pino = parent_ino(filp->f_path.dentry);

		D1(printk(KERN_DEBUG "Dirent 1: \"..\", ino #%lu\n", pino));

		D1(printk(KERN_DEBUG "Dirent 1: \"..\", ino #%lu\n", pino));

		if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0)

		if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0)

			goto out;

			goto out;