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

Commit 6cc9c1d2 authored by Al Viro's avatar Al Viro
Browse files

fix isofs d_op handling 



switch to ->s_d_op; d_obtain_alias() will DTRT now

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c8aebb0c

fs/isofs/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -939,17 +939,18 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) 
		goto out_iput;

	}



	/* get the root dentry */

	s->s_root = d_alloc_root(inode);

	if (!(s->s_root))

		goto out_no_root;



	table = 0;

	if (joliet_level)

		table += 2;

	if (opt.check == 'r')

		table++;

	d_set_d_op(s->s_root, &isofs_dentry_ops[table]);



	s->s_d_op = &isofs_dentry_ops[table];



	/* get the root dentry */

	s->s_root = d_alloc_root(inode);

	if (!(s->s_root))

		goto out_no_root;



	kfree(opt.iocharset);

fs/isofs/namei.c

+0 −2
Original line number Diff line number Diff line
@@ -172,8 +172,6 @@ struct dentry *isofs_lookup(struct inode *dir, struct dentry *dentry, struct nam 
	struct inode *inode;

	struct page *page;



	d_set_d_op(dentry, dir->i_sb->s_root->d_op);



	page = alloc_page(GFP_USER);

	if (!page)

		return ERR_PTR(-ENOMEM);